Merged silc_1_0_branch to trunk.

[silc.git] / win32 / silcdefs.h

diff --git a/win32/silcdefs.h b/win32/silcdefs.h
index 704383e134a35890fda7a79746f62f45f8b1ff24..eb0d689113690c9056e7e5c0071c9338ec51100c 100644 (file)
--- a/win32/silcdefs.h
+++ b/win32/silcdefs.h
@@ -49,7 +49,6 @@
 #define SILC_DOCDIR "doc"
 #define SILC_MODULESDIR "modules"
 #define SILC_LOGSDIR "logs"
-#define SILC_MANDIR "man"
 
 /* SIM (SILC Module) support */
 /* #undef SILC_SIM */
@@ -57,12 +56,14 @@
 /* #undef HAVE_RTLD_LAZY */
 
 /* Types */
+/*
 #define SILC_SIZEOF_LONG_LONG 8
 #define SILC_SIZEOF_LONG 4
 #define SILC_SIZEOF_INT 4
 #define SILC_SIZEOF_SHORT 2
 #define SILC_SIZEOF_CHAR 1
 #define SILC_SIZEOF_VOID_P 4
+*/
 
 /* MP library */
 /* #undef SILC_MP_GMP */
@@ -104,7 +105,9 @@
 
 /* Native WIN32 compilation (-mno-cygwin GCC option) under cygwin, though
    the code compiles with any native WIN32 compiler. */
+#ifndef SILC_WIN32
 #define SILC_WIN32 1
+#endif
 
 /* SILC distribution definitions (leave this at the end of file) */
 #define SILC_DIST_TOOLKIT 1