* specify full import names for imported variables under win32

git-svn-id: trunk@6674 -

packages/extra/gtk2/glib/gmem.inc

@@ -50,7 +50,11 @@ function g_mem_is_system_malloc:gboolean; cdecl; external gliblib;
 {$IFNDEF KYLIX}
 { Memory profiler and checker, has to be enabled via g_mem_set_vtable() }
 var
+  {$IFDEF WIN32}
+  glib_mem_profiler_table : PGMemVTable; external gliblib name 'glib_mem_profiler_table';
+  {$ELSE}
   glib_mem_profiler_table : PGMemVTable;cvar;external;
+  {$ENDIF}
 {$ENDIF}
 
 procedure g_mem_profile; cdecl; external gliblib;

packages/extra/gtk2/glib/gthread.inc

@@ -73,9 +73,15 @@
 
 {$IFNDEF KYLIX}
   var
+    {$IFDEF WIN32}
+    g_thread_functions_for_glib_use : TGThreadFunctions; external gliblib name 'g_thread_functions_for_glib_use';
+    g_thread_use_default_impl       : gboolean; external gliblib name 'g_thread_use_default_impl';
+    g_threads_got_initialized       : gboolean; external gliblib name 'g_threads_got_initialized';
+    {$ELSE}
     g_thread_functions_for_glib_use : TGThreadFunctions;cvar;external;      // ?????
     g_thread_use_default_impl       : gboolean;cvar;external;
     g_threads_got_initialized       : gboolean;cvar;external;
+    {$ENDIF}
 {$ENDIF}
 
 

packages/extra/gtk2/gtk+/gdk/gdk2.pas

@@ -178,7 +178,11 @@ function gdk_event_send_client_message_for_display(display:PGdkDisplay; event:PG
 {$IFNDEF KYLIX}
 { Threading }
 var
+  {$IFDEF WIN32}
+  gdk_threads_mutex : PGMutex; external gdklib name 'gdk_threads_mutex';
+  {$ELSE}
   gdk_threads_mutex : PGMutex; cvar; external;
+  {$ENDIF}
 {$ENDIF}
 
 procedure gdk_threads_enter; cdecl; external gdklib;

packages/extra/gtk2/gtk+/gtk/gtk2.pas

@@ -132,6 +132,9 @@ type
 
 implementation
 
+uses
+  SysUtils;
+
 {$IFDEF FPC}
 { There is a bug in the compiler. If an external variable is not used, it will
   create code, that can be relocated by the linker.

packages/extra/gtk2/gtk+/gtk/gtkfilesystem.inc

@@ -332,11 +332,9 @@ begin
    gtk_file_path_copy:=gtk_file_path_new_dup(gtk_file_path_get_string(path));
 end;
 
-function strcmp (str1, str2: pchar): longint; cdecl; external;
-
 function gtk_file_path_compare(path1,path2 : PGtkFilePath) : longint;
 begin
-   gtk_file_path_compare:=strcmp(gtk_file_path_get_string(path1),gtk_file_path_get_string(path2));
+   gtk_file_path_compare:=StrComp(gtk_file_path_get_string(path1),gtk_file_path_get_string(path2));
 end;
 
 

packages/extra/gtk2/gtk+/gtk/gtktextlayout.inc

@@ -132,7 +132,11 @@
 {$IFDEF read_interface_rest}
 {$IFNDEF KYLIX}
 var
+  {$IFDEF WIN32}
+   gtk_text_attr_appearance_type : TPangoAttrType; external gtklib name 'gtk_text_attr_appearance_type';
+  {$ELSE}
    gtk_text_attr_appearance_type : TPangoAttrType;cvar; external;
+  {$ENDIF}
 {$ENDIF}