diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2005-12-19 04:11:47 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2005-12-19 04:11:47 +0000 |
| commit | 7ef0c29f312b04359a27fcb040f54aea610b3594 (patch) | |
| tree | 998e143c6f071b65b1eabc2b3be177a7bce44faf /src/dumpOSC.c | |
| parent | 6d196fd8683288fa5f29f6eddd28fb12a0a06c79 (diff) | |
fixed up OSC for MinGW, doesn't compile the OSC.dll lib, but the individual objects compile fine
svn path=/trunk/externals/OSCx/; revision=4255
Diffstat (limited to 'src/dumpOSC.c')
| -rw-r--r-- | src/dumpOSC.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/dumpOSC.c b/src/dumpOSC.c index 873a3a9..8d34896 100644 --- a/src/dumpOSC.c +++ b/src/dumpOSC.c @@ -80,10 +80,12 @@ The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl //void sys_addpollfn(int fd, t_fdpollfn fn, void *ptr);
-#if defined(__sgi) || defined(__linux) || defined(WIN32) || defined(__APPLE__)
+#if defined(__sgi) || defined(__linux) || defined(_WIN32) || defined(__APPLE__)
-#ifdef WIN32
+#ifdef _WIN32
+ #ifdef _MSC_VER
#include "OSC-common.h"
+ #endif /* _MSC_VER */
#include <winsock2.h>
#include <string.h>
#include <stdlib.h>
@@ -122,7 +124,7 @@ The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl #include <sys/schedctl.h>
#include <sys/lock.h>
#endif
-#endif
+#endif /* _WIN32 */
char *htm_error_string;
@@ -329,7 +331,7 @@ static void dumpOSC_free(t_dumpOSC *x) }
}
-#ifdef WIN32
+#ifdef _MSC_VER
OSC_API void dumpOSC_setup(void)
#else
void dumpOSC_setup(void)
|