aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2010-03-24 17:25:22 +0000
committerIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2010-03-24 17:25:22 +0000
commite86f8f869bd3be7429ba1957dab3913e6f1260c1 (patch)
tree3742ace3dc23e8d36f14105a6d793c82b9f51f59
parent35e89ad3034e7924ce39a0a5c0dffc6d1920bbea (diff)
fixed M$VC preprocessor code
svn path=/trunk/externals/iem/iemnet/; revision=13260
-rw-r--r--iemnet.h8
-rw-r--r--tcpserver.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/iemnet.h b/iemnet.h
index 58d98bb..1b5fc22 100644
--- a/iemnet.h
+++ b/iemnet.h
@@ -85,15 +85,15 @@ void iemnet__receiver_destroy(t_iemnet_receiver*);
# define CCALL __cdecl
# pragma section(".CRT$XCU",read)
# define IEMNET_INITIALIZER(f) \
- static void __cdecl f(void); \
+ static void __cdecl autoinit__ ## f(void); \
__declspec(allocate(".CRT$XCU")) void (__cdecl*f##_)(void) = f; \
- static void __cdecl f(void)
+ static void __cdecl autoinit__ ## f(void) { f(); }
#elif defined(__GNUC__)
# define IEMNET_EXTERN extern
# define CCALL
# define IEMNET_INITIALIZER(f) \
- static void autoinit ## f(void) __attribute__((constructor)); \
- static void autoinit ## f(void) { f(); }
+ static void autoinit__ ## f(void) __attribute__((constructor)); \
+ static void autoinit__ ## f(void) { f(); }
#endif
diff --git a/tcpserver.c b/tcpserver.c
index 52067a6..e84eb10 100644
--- a/tcpserver.c
+++ b/tcpserver.c
@@ -416,7 +416,7 @@ static void tcpserver_free(t_tcpserver *x)
}
}
-IEMNET_EXTERN void tcpserver_setup(void)
+IEMNET_EXTERN void tcpserver_setup(void)
{
static int again=0; if(again)return; again=1;