From: Tim R. <ma...@us...> - 2004-11-25 22:04:22
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6706/src Modified Files: main.c Log Message: This makes win32 compile again, oops. I also gives rid of a nss warning, and creates a leak instead. But leaking one string in an init function is better than possibly crashing. In general, I don't understand why it's putting /prefixtogaim/lib/gaim in front of that, as that .so is never in that location. Index: main.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/main.c,v retrieving revision 1.136 retrieving revision 1.137 diff -u -d -p -r1.136 -r1.137 --- main.c 23 Nov 2004 21:24:32 -0000 1.136 +++ main.c 25 Nov 2004 22:03:58 -0000 1.137 @@ -585,6 +585,7 @@ startup_notification_complete(void) } #endif /* HAVE_STARTUP_NOTIFICATION */ +#ifndef _WIN32 static char *gaim_find_binary_location(void *symbol, void *data) { static char *fullname = NULL; @@ -632,7 +633,7 @@ static char *gaim_find_binary_location(v fullname = basebuf; return strdup(fullname); } - +#endif /* #ifndef _WIN32 */ /* FUCKING GET ME A TOWEL! */ #ifdef _WIN32 @@ -672,7 +673,9 @@ int main(int argc, char *argv[]) #ifdef DEBUG opt_debug = 1; #endif +#ifndef _WIN32 br_set_locate_fallback_func(gaim_find_binary_location, argv[0]); +#endif #ifdef ENABLE_NLS bindtextdomain(PACKAGE, LOCALEDIR); bind_textdomain_codeset(PACKAGE, "UTF-8"); |