Hi, Here is an export file to change __declspec(dllimport) to WINIMPORT.
It is built on top of my previous change, apply it then this. Roger
# HG changeset patch # User Roger Massey <[email protected]> # Date 1364597187 21600 # Node ID 55163bd21d7c32d6e93ddab18417cb849bb53e67 # Parent 655d9c94870bd2e17572d30f3ee283c256efff1f change dllimport to WINIMPORT diff -r 655d9c94870b -r 55163bd21d7c clientlib/misc.c --- a/clientlib/misc.c Fri Mar 29 13:15:43 2013 -0600 +++ b/clientlib/misc.c Fri Mar 29 16:46:27 2013 -0600 @@ -402,7 +402,7 @@ PidRunningStat pstat; #if _MSC_VER -__declspec(dllimport) +WINIMPORT __out void * __stdcall diff -r 655d9c94870b -r 55163bd21d7c include/projectcommon.h.in --- a/include/projectcommon.h.in Fri Mar 29 13:15:43 2013 -0600 +++ b/include/projectcommon.h.in Fri Mar 29 16:46:27 2013 -0600 @@ -36,6 +36,7 @@ # define _W64 #endif # define WINEXPORT __declspec( dllexport ) +# define WINIMPORT __declspec( dllimport ) # define MSG_DONTWAIT 0 // This could be trouble!! #if _MSC_VER < 1300 # define MSG_TRUNC 0 diff -r 655d9c94870b -r 55163bd21d7c nanoprobe/nanoprobe.c --- a/nanoprobe/nanoprobe.c Fri Mar 29 13:15:43 2013 -0600 +++ b/nanoprobe/nanoprobe.c Fri Mar 29 16:46:27 2013 -0600 @@ -51,8 +51,8 @@ #ifdef WIN32 #define SEP "\\" # undef HAS_FORK -__declspec(dllimport) int errcount; -__declspec(dllimport) GMainLoop* mainloop; +WINIMPORT int errcount; +WINIMPORT GMainLoop* mainloop; WINEXPORT void remove_pid_file(const char * pidfile); WINEXPORT void daemonize_me(gboolean stay_in_foreground, const char * dirtorunin, char* pidfile); WINEXPORT PidRunningStat are_we_already_running(const char * pidfile, int* pid); diff -r 655d9c94870b -r 55163bd21d7c testcode/pcap+mainloop.c --- a/testcode/pcap+mainloop.c Fri Mar 29 13:15:43 2013 -0600 +++ b/testcode/pcap+mainloop.c Fri Mar 29 16:46:27 2013 -0600 @@ -59,9 +59,9 @@ #define TESTPORT 1984 #ifdef WIN32 -__declspec(dllimport) int errcount; -__declspec(dllimport) NanoHbStats nano_hbstats; -__declspec(dllimport) GMainLoop* mainloop; +WINIMPORT int errcount; +WINIMPORT NanoHbStats nano_hbstats; +WINIMPORT GMainLoop* mainloop; #else extern int errcount; extern NanoHbStats nano_hbstats;
_______________________________________________ Assimilation mailing list - Discovery-Driven Monitoring [email protected] http://lists.community.tummy.com/cgi-bin/mailman/listinfo/assimilation http://assimmon.org/
