changeset 3854:17b650a36bca

[gaim-migrate @ 4006] var rename committer: Tailor Script <tailor@pidgin.im>
author Herman Bloggs <hermanator12002@yahoo.com>
date Sat, 02 Nov 2002 01:32:28 +0000
parents eddcb3a8c74e
children 38c95b5835f9
files src/win_aim.c
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/win_aim.c	Sat Nov 02 01:30:20 2002 +0000
+++ b/src/win_aim.c	Sat Nov 02 01:32:28 2002 +0000
@@ -12,13 +12,18 @@
 /*
  *  GLOBALS
  */
-__declspec(dllimport) HINSTANCE g_hInstance;
+__declspec(dllimport) HINSTANCE gaimexe_hInstance;
+
+/*
+ *  LOCALS
+ */
 
 /*
  *  PROTOTYPES
  */
 extern int gaim_main( int, char** );
 
+
 #ifdef __GNUC__
 #  ifndef _stdcall
 #    define _stdcall  __attribute__((stdcall))
@@ -31,7 +36,7 @@
 	 char               *lpszCmdLine,
 	 int                 nCmdShow)
 {
-	g_hInstance = hInstance;
+	gaimexe_hInstance = hInstance;
 	return gaim_main (__argc, __argv);
 }