+ merged Fixed calling convention for win32

packages/mysql/mysql.pp

@@ -32,7 +32,7 @@ type
    Socket = Longint;
    PCardinal = ^Cardinal;    
 
-{$ifdef linux}    
+{$ifdef Unix}    
 Var
   mysql_port : cardinal; external name 'mysql_port';
   mysql_unix_port : pchar; external name 'mysql_unix_port';
@@ -160,82 +160,82 @@ Function mysql_error(mysql : PMYSQL) : pchar;
 
 { Original functions }
 
-Function mysql_connect (mysql : PMYSQL; host,user,passwd: pchar) : PMYSQL; cdecl;
+Function mysql_connect (mysql : PMYSQL; host,user,passwd: pchar) : PMYSQL; {$ifdef win32} stdcall {$else} cdecl {$endif};
 Function mysql_real_connect (mysql : PMYSQL; const host,user,passwd : pchar;
 				   port : cardinal;
 				   unix_socket : pchar;
-				   clientflag : cardinal) : PMYSQL;cdecl;
+				   clientflag : cardinal) : PMYSQL;{$ifdef win32} stdcall {$else} cdecl {$endif};
 				   
-Function mysql_close(sock : PMYSQL) : longint; cdecl;
-Function mysql_select_db(MYSQL : PMYSQL; db : Pchar) : longint; cdecl;
-Function mysql_query(mysql : PMYSQL; q : pchar) : longint; cdecl;
-Function mysql_real_query(mysql : PMYSQL; q : Pchar; length : longint) : longint; cdecl;
-Function mysql_create_db(mysql : PMYSQL; db : pchar) : longint; cdecl;
-Function mysql_drop_db(mysql : PMYSQL; DB : Pchar) : longint; cdecl;
-Function mysql_shutdown(mysql : PMYSQL) : longint; cdecl;
-Function mysql_dump_debug_info(mysql : PMYSQL) : longint; cdecl;
-Function mysql_refresh(mysql : PMYSQL; refresh_options : cardinal) : longint; cdecl;
-Function mysql_kill(mysql : PMYSQL; pid : Cardinal) : longint; cdecl;
-Function mysql_stat(mysql : PMYSQL) : Pchar; cdecl;
-Function mysql_get_server_info(mysql : PMYSQL) : pchar; cdecl;
-Function mysql_get_client_info : pchar; cdecl;
-Function mysql_get_host_info(mysql : PMYSQL) : pchar; cdecl;
-Function mysql_get_proto_info(mysql : PMYSQL) : Cardinal; cdecl;
-Function mysql_list_dbs(mysql : PMYSQL;wild : Pchar) : PMYSQL_RES; cdecl;
-Function  mysql_list_tables(mysql : PMYSQL;Wild : Pchar) : PMYSQL_RES; cdecl;
-Function  mysql_list_fields(mysql : PMYSQL; table,wild : pchar) : PMYSQL_RES; cdecl;
-Function  mysql_list_processes(mysql : PMYSQL) : PMYSQL_RES; cdecl;
-Function  mysql_store_result(mysql : PMYSQL) : PMYSQL_RES; cdecl;
-Function  mysql_use_result(mysql : PMYSQL) : PMYSQL_RES; cdecl;
-Procedure mysql_free_result(res : PMYSQL_RES);cdecl;
-Procedure mysql_data_seek(mysql : PMYSQL_RES; offs : cardinal);cdecl;
-Function mysql_row_seek(mysql : PMYSQL_RES; Offs: TMYSQL_ROW_OFFSET): TMYSQL_ROW_OFFSET; cdecl;
-Function mysql_field_seek(musql : PMYSQL_RES;offs : TMYSQL_FIELD_OFFSET): TMYSQL_FIELD_OFFSET; cdecl;
-Function mysql_fetch_row(mysql : PMYSQL_RES) : TMYSQL_ROW; cdecl;
-Function mysql_fetch_lengths(mysql : PMYSQL_RES) : PCardinal; cdecl;
-Function mysql_fetch_field(handle : PMYSQL_RES) : PMYSQL_FIELD; cdecl;
-Function mysql_escape_string(escto,escfrom : pchar; length : Cardinal) : cardinal; cdecl;
-Procedure mysql_debug(debug : pchar);cdecl;
+Function mysql_close(sock : PMYSQL) : longint; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_select_db(MYSQL : PMYSQL; db : Pchar) : longint; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_query(mysql : PMYSQL; q : pchar) : longint; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_real_query(mysql : PMYSQL; q : Pchar; length : longint) : longint; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_create_db(mysql : PMYSQL; db : pchar) : longint; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_drop_db(mysql : PMYSQL; DB : Pchar) : longint; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_shutdown(mysql : PMYSQL) : longint; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_dump_debug_info(mysql : PMYSQL) : longint; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_refresh(mysql : PMYSQL; refresh_options : cardinal) : longint; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_kill(mysql : PMYSQL; pid : Cardinal) : longint; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_stat(mysql : PMYSQL) : Pchar; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_get_server_info(mysql : PMYSQL) : pchar; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_get_client_info : pchar; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_get_host_info(mysql : PMYSQL) : pchar; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_get_proto_info(mysql : PMYSQL) : Cardinal; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_list_dbs(mysql : PMYSQL;wild : Pchar) : PMYSQL_RES; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function  mysql_list_tables(mysql : PMYSQL;Wild : Pchar) : PMYSQL_RES; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function  mysql_list_fields(mysql : PMYSQL; table,wild : pchar) : PMYSQL_RES; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function  mysql_list_processes(mysql : PMYSQL) : PMYSQL_RES; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function  mysql_store_result(mysql : PMYSQL) : PMYSQL_RES; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function  mysql_use_result(mysql : PMYSQL) : PMYSQL_RES; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Procedure mysql_free_result(res : PMYSQL_RES);{$ifdef win32} stdcall {$else} cdecl {$endif};
+Procedure mysql_data_seek(mysql : PMYSQL_RES; offs : cardinal);{$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_row_seek(mysql : PMYSQL_RES; Offs: TMYSQL_ROW_OFFSET): TMYSQL_ROW_OFFSET; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_field_seek(musql : PMYSQL_RES;offs : TMYSQL_FIELD_OFFSET): TMYSQL_FIELD_OFFSET; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_fetch_row(mysql : PMYSQL_RES) : TMYSQL_ROW; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_fetch_lengths(mysql : PMYSQL_RES) : PCardinal; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_fetch_field(handle : PMYSQL_RES) : PMYSQL_FIELD; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Function mysql_escape_string(escto,escfrom : pchar; length : Cardinal) : cardinal; {$ifdef win32} stdcall {$else} cdecl {$endif};
+Procedure mysql_debug(debug : pchar);{$ifdef win32} stdcall {$else} cdecl {$endif};
 
 implementation
 
 
-function mysql_connect (mysql : PMYSQL; host,user,passwd: pchar) : PMYSQL;cdecl; external mysqllib name 'mysql_connect';
+function mysql_connect (mysql : PMYSQL; host,user,passwd: pchar) : PMYSQL;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_connect';
 function mysql_real_connect (mysql : PMYSQL; const host,user,passwd : pchar;
 				   port : cardinal;
 				   unix_socket : pchar;
-				   clientflag : cardinal) : PMYSQL;cdecl; external mysqllib;
+				   clientflag : cardinal) : PMYSQL;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib;
 				   
-function mysql_close(sock : PMYSQL) : longint ;cdecl; external mysqllib name 'mysql_close';
-function mysql_select_db(MYSQL : PMYSQL; db : Pchar) : longint;cdecl; external mysqllib name 'mysql_select_db';
-function mysql_query(mysql : PMYSQL; q : pchar) : longint;cdecl; external mysqllib name 'mysql_query';
-function mysql_real_query(mysql : PMYSQL; q : Pchar; length : longint) : longint;cdecl; external mysqllib name 'mysql_real_query';
-function mysql_create_db(mysql : PMYSQL; db : pchar) : longint;cdecl; external mysqllib name 'mysql_create_db';
-Function mysql_drop_db(mysql : PMYSQL; DB : Pchar) : longint;cdecl; external mysqllib name 'mysql_drop_db';
-Function mysql_shutdown(mysql : PMYSQL) : longint;cdecl; external mysqllib name 'mysql_shutdown';
-Function mysql_dump_debug_info(mysql : PMYSQL) : longint;cdecl; external mysqllib name 'mysql_dump_debug_info';
-Function mysql_refresh(mysql : PMYSQL; refresh_options : cardinal) : longint;cdecl; external mysqllib name 'mysql_refresh';
-Function mysql_kill(mysql : PMYSQL; pid : Cardinal) : longint;cdecl; external mysqllib name 'mysql_kill';
-Function mysql_stat(mysql : PMYSQL) : Pchar;cdecl; external mysqllib name 'mysql_stat';
-Function mysql_get_server_info(mysql : PMYSQL) : pchar;cdecl; external mysqllib name 'mysql_get_server_info';
-Function mysql_get_client_info : pchar;cdecl; external mysqllib;
-Function mysql_get_host_info(mysql : PMYSQL) : pchar;cdecl; external mysqllib name 'mysql_get_host_info';
-Function mysql_get_proto_info(mysql : PMYSQL) : Cardinal;cdecl; external mysqllib name 'mysql_get_proto_info';
-Function mysql_list_dbs(mysql : PMYSQL;wild : Pchar) : PMYSQL_RES;cdecl; external mysqllib name 'mysql_list_dbs';
-Function mysql_list_tables(mysql : PMYSQL;Wild : Pchar) : PMYSQL_RES;cdecl; external mysqllib name 'mysql_list_tables';
-Function mysql_list_fields(mysql : PMYSQL; table,wild : pchar) : PMYSQL_RES;cdecl; external mysqllib name 'mysql_list_fields';
-Function mysql_list_processes(mysql : PMYSQL) : PMYSQL_RES;cdecl; external mysqllib name 'mysql_list_processes';
-Function mysql_store_result(mysql : PMYSQL) : PMYSQL_RES;cdecl; external mysqllib name 'mysql_store_result';
-Function mysql_use_result(mysql : PMYSQL) : PMYSQL_RES;cdecl; external mysqllib name 'mysql_use_result';
-Procedure mysql_free_result(res : PMYSQL_RES);cdecl; external mysqllib name 'mysql_free_result';
-Procedure mysql_data_seek(mysql : PMYSQL_RES; offs : cardinal);cdecl; external mysqllib name 'mysql_data_seek';
-Function mysql_row_seek(mysql : PMYSQL_RES; Offs: TMYSQL_ROW_OFFSET): TMYSQL_ROW_OFFSET;cdecl; external mysqllib name 'mysql_row_seek';
-Function mysql_field_seek(musql : PMYSQL_RES;offs : TMYSQL_FIELD_OFFSET): TMYSQL_FIELD_OFFSET;cdecl; external mysqllib name 'mysql_field_seek';
-function mysql_fetch_row(mysql : PMYSQL_RES) : TMYSQL_ROW;cdecl; external mysqllib name 'mysql_fetch_row';
-function mysql_fetch_lengths(mysql : PMYSQL_RES) : PCardinal;cdecl; external mysqllib name 'mysql_fetch_lengths';
-function mysql_fetch_field(handle : PMYSQL_RES) : PMYSQL_FIELD;cdecl; external mysqllib name 'mysql_fetch_field';
-Function mysql_escape_string(escto,escfrom : pchar; length : Cardinal) : cardinal;cdecl; external mysqllib name 'mysql_escape_string';
-Procedure mysql_debug(debug : pchar);cdecl; external mysqllib name 'mysql_debug';
+function mysql_close(sock : PMYSQL) : longint ;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_close';
+function mysql_select_db(MYSQL : PMYSQL; db : Pchar) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_select_db';
+function mysql_query(mysql : PMYSQL; q : pchar) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_query';
+function mysql_real_query(mysql : PMYSQL; q : Pchar; length : longint) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_real_query';
+function mysql_create_db(mysql : PMYSQL; db : pchar) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_create_db';
+Function mysql_drop_db(mysql : PMYSQL; DB : Pchar) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_drop_db';
+Function mysql_shutdown(mysql : PMYSQL) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_shutdown';
+Function mysql_dump_debug_info(mysql : PMYSQL) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_dump_debug_info';
+Function mysql_refresh(mysql : PMYSQL; refresh_options : cardinal) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_refresh';
+Function mysql_kill(mysql : PMYSQL; pid : Cardinal) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_kill';
+Function mysql_stat(mysql : PMYSQL) : Pchar;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_stat';
+Function mysql_get_server_info(mysql : PMYSQL) : pchar;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_get_server_info';
+Function mysql_get_client_info : pchar;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib;
+Function mysql_get_host_info(mysql : PMYSQL) : pchar;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_get_host_info';
+Function mysql_get_proto_info(mysql : PMYSQL) : Cardinal;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_get_proto_info';
+Function mysql_list_dbs(mysql : PMYSQL;wild : Pchar) : PMYSQL_RES;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_list_dbs';
+Function mysql_list_tables(mysql : PMYSQL;Wild : Pchar) : PMYSQL_RES;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_list_tables';
+Function mysql_list_fields(mysql : PMYSQL; table,wild : pchar) : PMYSQL_RES;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_list_fields';
+Function mysql_list_processes(mysql : PMYSQL) : PMYSQL_RES;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_list_processes';
+Function mysql_store_result(mysql : PMYSQL) : PMYSQL_RES;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_store_result';
+Function mysql_use_result(mysql : PMYSQL) : PMYSQL_RES;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_use_result';
+Procedure mysql_free_result(res : PMYSQL_RES);{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_free_result';
+Procedure mysql_data_seek(mysql : PMYSQL_RES; offs : cardinal);{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_data_seek';
+Function mysql_row_seek(mysql : PMYSQL_RES; Offs: TMYSQL_ROW_OFFSET): TMYSQL_ROW_OFFSET;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_row_seek';
+Function mysql_field_seek(musql : PMYSQL_RES;offs : TMYSQL_FIELD_OFFSET): TMYSQL_FIELD_OFFSET;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_field_seek';
+function mysql_fetch_row(mysql : PMYSQL_RES) : TMYSQL_ROW;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_fetch_row';
+function mysql_fetch_lengths(mysql : PMYSQL_RES) : PCardinal;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_fetch_lengths';
+function mysql_fetch_field(handle : PMYSQL_RES) : PMYSQL_FIELD;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_fetch_field';
+Function mysql_escape_string(escto,escfrom : pchar; length : Cardinal) : cardinal;{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_escape_string';
+Procedure mysql_debug(debug : pchar);{$ifdef win32} stdcall {$else} cdecl {$endif}; external mysqllib name 'mysql_debug';
 
 Function  mysql_error(mysql : PMYSQL) : pchar;
 
@@ -325,10 +325,13 @@ end.
 
 {
   $Log$
-  Revision 1.4  2000-12-03 13:41:39  sg
+  Revision 1.5  2001-03-13 08:50:38  michael
+  + merged Fixed calling convention for win32
+
+  Revision 1.4  2000/12/03 13:41:39  sg
   * Fixed small merging bug by Michael
 
   Revision 1.3  2000/12/02 15:24:37  michael
   + Merged changes from fixbranch
 
-}
+}

packages/mysql/mysql_com.pp

@@ -125,12 +125,12 @@ Const
 FIELD_TYPE_CHAR = FIELD_TYPE_TINY;		{ For compability }
 FIELD_TYPE_INTERVAL = FIELD_TYPE_ENUM;  	{ For compability }
 
-Procedure sql_free (root : PMEM_ROOT);cdecl;
-Procedure init_alloc_root (root: PMEM_ROOT;block_size : Cardinal);cdecl;
-Function sql_alloc_first_block(root : PMEM_ROOT) : my_bool;cdecl;
-Function sql_alloc_root(mem_root : PMEM_ROOT;len : Cardinal) : longint;cdecl;
-Function sql_strdup_root(root : PMEM_ROOT;st : pchar) : pchar;cdecl;
-Function sql_memdup_root(root: PMEM_ROOT;st : pchar; len : Cardinal): longint;cdecl;
+Procedure sql_free (root : PMEM_ROOT);{$ifdef win32} stdcall {$else} cdecl {$endif};
+Procedure init_alloc_root (root: PMEM_ROOT;block_size : Cardinal);{$ifdef win32} stdcall {$else} cdecl {$endif};
+Function sql_alloc_first_block(root : PMEM_ROOT) : my_bool;{$ifdef win32} stdcall {$else} cdecl {$endif};
+Function sql_alloc_root(mem_root : PMEM_ROOT;len : Cardinal) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif};
+Function sql_strdup_root(root : PMEM_ROOT;st : pchar) : pchar;{$ifdef win32} stdcall {$else} cdecl {$endif};
+Function sql_memdup_root(root: PMEM_ROOT;st : pchar; len : Cardinal): longint;{$ifdef win32} stdcall {$else} cdecl {$endif};
 
 {
 extern unsigned long max_allowed_packet;
@@ -141,14 +141,14 @@ extern unsigned long net_buffer_length;
 #define net_new_transaction(net) ((net)->pkt_nr=0)
 }
 
-Function  my_net_init(net :PNET; fd : Socket) : Longint;cdecl;
-procedure net_end(net : PNET);cdecl;
-Procedure net_clear(net : PNET);cdecl;
-Function  net_flush(net : PNET) : longint;cdecl;
-Function  my_net_write(net : PNET;packet : pbyte;len : cardinal) : longint;cdecl;
-Function  net_write_command(net : PNET; command : char;packet : pbyte;len : cardinal) : longint;cdecl;
-Function  net_real_write(net : PNET;packet : pbyte; len : Cardinal) : longint;cdecl;
-Function  my_net_read(net : PNET) : Cardinal;cdecl;
+Function  my_net_init(net :PNET; fd : Socket) : Longint;{$ifdef win32} stdcall {$else} cdecl {$endif};
+procedure net_end(net : PNET);{$ifdef win32} stdcall {$else} cdecl {$endif};
+Procedure net_clear(net : PNET);{$ifdef win32} stdcall {$else} cdecl {$endif};
+Function  net_flush(net : PNET) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif};
+Function  my_net_write(net : PNET;packet : pbyte;len : cardinal) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif};
+Function  net_write_command(net : PNET; command : char;packet : pbyte;len : cardinal) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif};
+Function  net_real_write(net : PNET;packet : pbyte; len : Cardinal) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif};
+Function  my_net_read(net : PNET) : Cardinal;{$ifdef win32} stdcall {$else} cdecl {$endif};
 
 Type
 TRand_struct  = record
@@ -183,13 +183,13 @@ PUDF_INIT = TUDF_INIT;
 
   { Prototypes to password functions }
 
-procedure randominit(rand : Prand_struct; seed1,seed2 : Cardinal);cdecl;
-Function  rnd(rand : Prand_struct) : double;cdecl;
-procedure make_scrambled_password(toarg, passwd : Pchar);cdecl;
-procedure get_salt_from_password(res : pcardinal; password : pchar);cdecl;
-procedure scramble(toarg,message,password : pchar; old_ver : my_bool);cdecl;
-function  check_scramble(scramble,message : pchar; salt : cardinal;old_ver:my_bool) : my_bool;cdecl;
-function  get_tty_password(opt_message:  pchar) : pchar;cdecl;
+procedure randominit(rand : Prand_struct; seed1,seed2 : Cardinal);{$ifdef win32} stdcall {$else} cdecl {$endif};
+Function  rnd(rand : Prand_struct) : double;{$ifdef win32} stdcall {$else} cdecl {$endif};
+procedure make_scrambled_password(toarg, passwd : Pchar);{$ifdef win32} stdcall {$else} cdecl {$endif};
+procedure get_salt_from_password(res : pcardinal; password : pchar);{$ifdef win32} stdcall {$else} cdecl {$endif};
+procedure scramble(toarg,message,password : pchar; old_ver : my_bool);{$ifdef win32} stdcall {$else} cdecl {$endif};
+function  check_scramble(scramble,message : pchar; salt : cardinal;old_ver:my_bool) : my_bool;{$ifdef win32} stdcall {$else} cdecl {$endif};
+function  get_tty_password(opt_message:  pchar) : pchar;{$ifdef win32} stdcall {$else} cdecl {$endif};
 
 {
 #define NULL_LENGTH ((unsigned long) ~0) { For net_store_length }
@@ -197,31 +197,34 @@ function  get_tty_password(opt_message:  pchar) : pchar;cdecl;
 
 implementation
 
-Procedure sql_free (root : PMEM_ROOT);cdecl;external;
-Procedure init_alloc_root (root: PMEM_ROOT;block_size : Cardinal);cdecl;external;
-Function sql_alloc_first_block(root : PMEM_ROOT) : my_bool;cdecl;external;
-Function sql_alloc_root(mem_root : PMEM_ROOT;len : Cardinal) : longint;cdecl;external;
-Function sql_strdup_root(root : PMEM_ROOT;st : pchar) : pchar;cdecl;external;
-Function sql_memdup_root(root: PMEM_ROOT;st : pchar; len : Cardinal) : longint;cdecl;external;
-Function  my_net_init(net :PNET; fd : Socket) : Longint;cdecl;external;
-procedure net_end(net : PNET);cdecl;external;
-Procedure net_clear(net : PNET);cdecl;external;
-Function  net_flush(net : PNET) : longint;cdecl;external;
-Function  my_net_write(net : PNET;packet : pbyte;len : cardinal) : longint;cdecl;external;
-Function  net_write_command(net : PNET; command : char;packet : pbyte;len : cardinal) : longint;cdecl;external;
-Function  net_real_write(net : PNET;packet : pbyte; len : Cardinal) : longint;cdecl;external;
-Function  my_net_read(net : PNET) : Cardinal;cdecl;external;
-procedure randominit(rand : Prand_struct; seed1,seed2 : Cardinal);cdecl;external;
-Function  rnd(rand : Prand_struct) : double;cdecl;external;
-procedure make_scrambled_password(toarg, passwd : Pchar);cdecl;external;
-procedure get_salt_from_password(res : pcardinal; password : pchar);cdecl;external;
-procedure scramble(toarg,message,password : pchar; old_ver : my_bool);cdecl;external;
-function  check_scramble(scramble,message : pchar; salt : cardinal;old_ver:my_bool) : my_bool;cdecl;external;
-function  get_tty_password(opt_message:  pchar) : pchar;cdecl;external;
+Procedure sql_free (root : PMEM_ROOT);{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+Procedure init_alloc_root (root: PMEM_ROOT;block_size : Cardinal);{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+Function sql_alloc_first_block(root : PMEM_ROOT) : my_bool;{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+Function sql_alloc_root(mem_root : PMEM_ROOT;len : Cardinal) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+Function sql_strdup_root(root : PMEM_ROOT;st : pchar) : pchar;{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+Function sql_memdup_root(root: PMEM_ROOT;st : pchar; len : Cardinal) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+Function  my_net_init(net :PNET; fd : Socket) : Longint;{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+procedure net_end(net : PNET);{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+Procedure net_clear(net : PNET);{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+Function  net_flush(net : PNET) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+Function  my_net_write(net : PNET;packet : pbyte;len : cardinal) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+Function  net_write_command(net : PNET; command : char;packet : pbyte;len : cardinal) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+Function  net_real_write(net : PNET;packet : pbyte; len : Cardinal) : longint;{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+Function  my_net_read(net : PNET) : Cardinal;{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+procedure randominit(rand : Prand_struct; seed1,seed2 : Cardinal);{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+Function  rnd(rand : Prand_struct) : double;{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+procedure make_scrambled_password(toarg, passwd : Pchar);{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+procedure get_salt_from_password(res : pcardinal; password : pchar);{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+procedure scramble(toarg,message,password : pchar; old_ver : my_bool);{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+function  check_scramble(scramble,message : pchar; salt : cardinal;old_ver:my_bool) : my_bool;{$ifdef win32} stdcall {$else} cdecl {$endif};external;
+function  get_tty_password(opt_message:  pchar) : pchar;{$ifdef win32} stdcall {$else} cdecl {$endif};external;
 
 end.
   $Log$
-  Revision 1.3  2000-12-02 15:24:37  michael
+  Revision 1.4  2001-03-13 08:50:38  michael
+  + merged Fixed calling convention for win32
+
+  Revision 1.3  2000/12/02 15:24:37  michael
   + Merged changes from fixbranch
 
   Revision 1.2  2000/07/13 11:33:26  michael