From: <rl...@us...> - 2007-02-04 19:43:11
|
Revision: 18181 http://svn.sourceforge.net/gaim/?rev=18181&view=rev Author: rlaager Date: 2007-02-04 11:43:08 -0800 (Sun, 04 Feb 2007) Log Message: ----------- SF Patch #1637687 from Damien Carbery 'The "__attribute__ ((constructor))" breaks on Solaris when using the Sun Forte compiler.' This patch uses the appropriate #pragma when using the Sun Forte compiler. Modified Paths: -------------- trunk/libgaim/plugins/perl/libgaimperl.c Modified: trunk/libgaim/plugins/perl/libgaimperl.c =================================================================== --- trunk/libgaim/plugins/perl/libgaimperl.c 2007-02-03 06:47:06 UTC (rev 18180) +++ trunk/libgaim/plugins/perl/libgaimperl.c 2007-02-04 19:43:08 UTC (rev 18181) @@ -1,7 +1,16 @@ #include <gmodule.h> + +#ifdef __SUNPRO_C +#pragma init (my_init) +void my_init(void); + +void my_init() { +#else void __attribute__ ((constructor)) my_init(void); void __attribute__ ((constructor)) my_init() { +#endif + /* Very evil hack...puts perl.so's symbols in the global table * but does not create a circular dependancy because g_module_open * will only open the library once. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |