+ Win32 dll also uses cdecl zip -r c:/temp/fpcsqlite sqlite

packages/base/sqlite/sqlite.pp

@@ -32,9 +32,11 @@ const
   _SQLITE_VERSION = '2.8.3';
   SQLITE_ISO8859 = 1;
 
+{$ifndef win32}
 var
   sqlite_version  : pchar;cvar;external;
   sqlite_encoding : pchar;cvar;external;
+{$endif}
 
 const
   SQLITE_OK         = 0;
@@ -106,59 +108,59 @@ Type
   
   // Procedural types used in functions.
   
-  sqlite_callback = function (_para1:pointer; _para2:longint; _para3:PPchar; _para4:PPchar):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};
-  sqlite_trace_func = procedure (_para1:pointer; _para2:Pchar);{$ifdef win32}stdcall{$else}cdecl{$endif};
-  sqlite_create_func = procedure (_para1:Psqlite_func; _para2:longint; _para3:PPchar);{$ifdef win32}stdcall{$else}cdecl{$endif};
-  sqlite_handler = function (_para1:pointer; _para2:Pchar; _para3:longint):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};
-  sqlite_step_func = procedure (_para1:Psqlite_func; _para2:longint; _para3:PPchar)  ;{$ifdef win32}stdcall{$else}cdecl{$endif};
-  sqlite_finalize_func = procedure (_para1:Psqlite_func);{$ifdef win32}stdcall{$else}cdecl{$endif};
-  sqlite_authorize_func = function (_para1:pointer; _para2:longint; _para3, _para4,_para5,_para6:Pchar):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};
+  sqlite_callback = function (_para1:pointer; _para2:longint; _para3:PPchar; _para4:PPchar):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};
+  sqlite_trace_func = procedure (_para1:pointer; _para2:Pchar);{$ifdef win32}cdecl{$else}cdecl{$endif};
+  sqlite_create_func = procedure (_para1:Psqlite_func; _para2:longint; _para3:PPchar);{$ifdef win32}cdecl{$else}cdecl{$endif};
+  sqlite_handler = function (_para1:pointer; _para2:Pchar; _para3:longint):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};
+  sqlite_step_func = procedure (_para1:Psqlite_func; _para2:longint; _para3:PPchar)  ;{$ifdef win32}cdecl{$else}cdecl{$endif};
+  sqlite_finalize_func = procedure (_para1:Psqlite_func);{$ifdef win32}cdecl{$else}cdecl{$endif};
+  sqlite_authorize_func = function (_para1:pointer; _para2:longint; _para3, _para4,_para5,_para6:Pchar):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};
   
-  function sqlite_create_function(_para1:Psqlite; zName:Pchar; nArg:longint; xFunc:sqlite_create_func; pUserData:pointer):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_create_function';
-  function sqlite_open(filename:Pchar; mode:longint; errmsg:PPchar):Psqlite;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_open';
-  procedure sqlite_close(_para1:Psqlite);{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_close';
-  function sqlite_exec(_para1:Psqlite; sql:Pchar; _para3:sqlite_callback; _para4:pointer; errmsg:PPchar):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_exec';
-  function sqlite_last_insert_rowid(_para1:Psqlite):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_last_insert_rowid';
-  function sqlite_changes(_para1:Psqlite):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_changes';
-  function sqlite_error_string(_para1:longint):Pchar;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_error_string';
-  procedure do_sqlite_interrupt(_para1:Psqlite);{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_interrupt';
-  function sqlite_complete(sql:Pchar):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_complete';
-  procedure sqlite_busy_handler(_para1:Psqlite; _para2:sqlite_handler; _para3:pointer);{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_busy_handler';
-  procedure sqlite_busy_timeout(_para1:Psqlite; ms:longint);{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_busy_timeout';
+  function sqlite_create_function(_para1:Psqlite; zName:Pchar; nArg:longint; xFunc:sqlite_create_func; pUserData:pointer):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_create_function';
+  function sqlite_open(filename:Pchar; mode:longint; errmsg:PPchar):Psqlite;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_open';
+  procedure sqlite_close(_para1:Psqlite);{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_close';
+  function sqlite_exec(_para1:Psqlite; sql:Pchar; _para3:sqlite_callback; _para4:pointer; errmsg:PPchar):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_exec';
+  function sqlite_last_insert_rowid(_para1:Psqlite):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_last_insert_rowid';
+  function sqlite_changes(_para1:Psqlite):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_changes';
+  function sqlite_error_string(_para1:longint):Pchar;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_error_string';
+  procedure do_sqlite_interrupt(_para1:Psqlite);{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_interrupt';
+  function sqlite_complete(sql:Pchar):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_complete';
+  procedure sqlite_busy_handler(_para1:Psqlite; _para2:sqlite_handler; _para3:pointer);{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_busy_handler';
+  procedure sqlite_busy_timeout(_para1:Psqlite; ms:longint);{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_busy_timeout';
   function sqlite_get_table(_para1:Psqlite; sql:Pchar; resultp:PPPchar; nrow:Plongint; ncolumn:Plongint; 
-             errmsg:PPchar):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_get_table';
-  procedure sqlite_free_table(result:PPchar);{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_free_table';
+             errmsg:PPchar):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_get_table';
+  procedure sqlite_free_table(result:PPchar);{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_free_table';
   function sqlite_exec_printf(_para1:Psqlite; sqlFormat:Pchar; _para3:sqlite_callback; _para4:pointer; errmsg:PPchar; 
-             args:array of const):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_exec_printf';
-  function sqlite_exec_printf(_para1:Psqlite; sqlFormat:Pchar; _para3:sqlite_callback; _para4:pointer; errmsg:PPchar):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_exec_printf';
+             args:array of const):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_exec_printf';
+  function sqlite_exec_printf(_para1:Psqlite; sqlFormat:Pchar; _para3:sqlite_callback; _para4:pointer; errmsg:PPchar):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_exec_printf';
   function sqlite_exec_vprintf(_para1:Psqlite; sqlFormat:Pchar; _para3:sqlite_callback; _para4:pointer; errmsg:PPchar; 
-             ap:array of const):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_exec_vprintf';
+             ap:array of const):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_exec_vprintf';
   function sqlite_get_table_printf(_para1:Psqlite; sqlFormat:Pchar; resultp:PPPchar; nrow:Plongint; ncolumn:Plongint; 
-             errmsg:PPchar; args:array of const):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_get_table_printf';
+             errmsg:PPchar; args:array of const):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_get_table_printf';
   function sqlite_get_table_printf(_para1:Psqlite; sqlFormat:Pchar; resultp:PPPchar; nrow:Plongint; ncolumn:Plongint; 
-             errmsg:PPchar):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_get_table_printf';
+             errmsg:PPchar):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_get_table_printf';
   function sqlite_get_table_vprintf(_para1:Psqlite; sqlFormat:Pchar; resultp:PPPchar; nrow:Plongint; ncolumn:Plongint; 
-             errmsg:PPchar; ap:array of const):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_get_table_vprintf';
-  function sqlite_mprintf(_para1:Pchar; args:array of const):Pchar;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_mprintf';
-  function sqlite_mprintf(_para1:Pchar):Pchar;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_mprintf';
-  procedure sqlite_freemem(p:pointer);{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_freemem';
-  function sqlite_libversion:Pchar;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_libversion';
-  function sqlite_libencoding:Pchar;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_libencoding';
+             errmsg:PPchar; ap:array of const):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_get_table_vprintf';
+  function sqlite_mprintf(_para1:Pchar; args:array of const):Pchar;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_mprintf';
+  function sqlite_mprintf(_para1:Pchar):Pchar;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_mprintf';
+  procedure sqlite_freemem(p:pointer);{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_freemem';
+  function sqlite_libversion:Pchar;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_libversion';
+  function sqlite_libencoding:Pchar;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_libencoding';
   function sqlite_create_aggregate(_para1:Psqlite; zName:Pchar; nArg:longint; xStep:sqlite_step_func ; xFinalize:sqlite_finalize_func; 
-             pUserData:pointer):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_create_aggregate';
-  function sqlite_function_type(db:Psqlite; zName:Pchar; datatype:longint):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_function_type';
-  function sqlite_set_result_string(_para1:Psqlite_func; _para2:Pchar; _para3:longint):Pchar;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_set_result_string';
-  procedure sqlite_set_result_int(_para1:Psqlite_func; _para2:longint);{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_set_result_int';
-  procedure sqlite_set_result_double(_para1:Psqlite_func; _para2:double);{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_set_result_double';
-  procedure sqlite_set_result_error(_para1:Psqlite_func; _para2:Pchar; _para3:longint);{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_set_result_error';
-  function sqlite_user_data(_para1:Psqlite_func):pointer;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_user_data';
-  function sqlite_aggregate_context(_para1:Psqlite_func; nBytes:longint):pointer;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_aggregate_context';
-  function sqlite_aggregate_count(_para1:Psqlite_func):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_aggregate_count';
-  function sqlite_set_authorizer(_para1:Psqlite; xAuth:sqlite_authorize_func ; pUserData:pointer):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_set_authorizer';
-  function sqlite_trace(_para1:Psqlite; xTrace:sqlite_trace_func; _para3:pointer):pointer;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_trace';
-  function sqlite_compile(db:Psqlite; zSql:Pchar; pzTail:PPchar; ppVm:PPsqlite_vm; pzErrmsg:PPchar):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_compile';
-  function sqlite_step(pVm:Psqlite_vm; pN:Plongint; pazValue:PPPchar; pazColName:PPPchar):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_step';
-  function sqlite_finalize(_para1:Psqlite_vm; pzErrMsg:PPchar):longint;{$ifdef win32}stdcall{$else}cdecl{$endif};external External_library name 'sqlite_finalize';
+             pUserData:pointer):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_create_aggregate';
+  function sqlite_function_type(db:Psqlite; zName:Pchar; datatype:longint):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_function_type';
+  function sqlite_set_result_string(_para1:Psqlite_func; _para2:Pchar; _para3:longint):Pchar;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_set_result_string';
+  procedure sqlite_set_result_int(_para1:Psqlite_func; _para2:longint);{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_set_result_int';
+  procedure sqlite_set_result_double(_para1:Psqlite_func; _para2:double);{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_set_result_double';
+  procedure sqlite_set_result_error(_para1:Psqlite_func; _para2:Pchar; _para3:longint);{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_set_result_error';
+  function sqlite_user_data(_para1:Psqlite_func):pointer;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_user_data';
+  function sqlite_aggregate_context(_para1:Psqlite_func; nBytes:longint):pointer;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_aggregate_context';
+  function sqlite_aggregate_count(_para1:Psqlite_func):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_aggregate_count';
+  function sqlite_set_authorizer(_para1:Psqlite; xAuth:sqlite_authorize_func ; pUserData:pointer):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_set_authorizer';
+  function sqlite_trace(_para1:Psqlite; xTrace:sqlite_trace_func; _para3:pointer):pointer;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_trace';
+  function sqlite_compile(db:Psqlite; zSql:Pchar; pzTail:PPchar; ppVm:PPsqlite_vm; pzErrmsg:PPchar):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_compile';
+  function sqlite_step(pVm:Psqlite_vm; pN:Plongint; pazValue:PPPchar; pazColName:PPPchar):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_step';
+  function sqlite_finalize(_para1:Psqlite_vm; pzErrMsg:PPchar):longint;{$ifdef win32}cdecl{$else}cdecl{$endif};external External_library name 'sqlite_finalize';
 
 implementation