# HG changeset patch
# User Herman Bloggs <hermanator12002@yahoo.com>
# Date 1036200748 0
# Node ID 17b650a36bca24028308027615f4c130c85881e3
# Parent  eddcb3a8c74e92fefe5d19c8eb40c43967d282dd
[gaim-migrate @ 4006]
var rename

committer: Tailor Script <tailor@pidgin.im>

diff -r eddcb3a8c74e -r 17b650a36bca src/win_aim.c
--- 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);
 }