Changeset 15660

Timestamp:

2008-05-23T11:04:31+12:00 (16 years ago)

Author:

mdewsnip

Message:

Various fixes to get MG to compile with Microsoft Visual Studio 2005.

Location:

indexers/trunk/mg

Files:

• lib/win32.mak (modified) (1 diff)
• src/images/utils.h (modified) (1 diff)
• src/images/win32.mak (modified) (1 diff)
• src/text/win32.mak (modified) (1 diff)
• win32cfg.h (modified) (1 diff)

indexers/trunk/mg/lib/win32.mak

@@ -32 +32 @@
 
 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -DPARADOCNUM \
-       -DSHORT_SUFFIX
+       -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
 
 INCLUDES = -I"." -I"$(MGHOME)"

indexers/trunk/mg/src/images/utils.h

@@ -31 +31 @@
 #define DEBUG
 
+#ifndef min
 #define min(a,b) ((a)<(b) ? (a) : (b))
+#endif
+#ifndef max
 #define max(a,b) ((a)>(b) ? (a) : (b))
+#endif
 
 #define GEN_MAGIC(a,b,c,d) ((unsigned long)(((a)<<24) + ((b)<<16) + \

indexers/trunk/mg/src/images/win32.mak

@@ -29 +29 @@
 CC = cl
 CPPFLAGS = 
-DEFS = -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN
+DEFS = -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
 INCLUDES = -I"." -I"$(MGHOME)" -I"$(MGHOME)\lib"
 LDFLAGS =

indexers/trunk/mg/src/text/win32.mak

@@ -33 +33 @@
 CC = cl
 CPPFLAGS = 
-# DEFS = -DQUIET -D__WIN32__ -DSHORT_SUFFIX -DHAVE_STRING_H -DHAVE_FCNTL_H \
-#        -DSTDC_HEADERS -DHAVE_CONFIG_H
 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H \
-       -D__WIN32__ -D_LITTLE_ENDIAN
+       -D__WIN32__ -D_LITTLE_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
 INCLUDES = -I"." -I"$(MGHOME)" -I"$(MGHOME)\lib"
 COMPILE = $(CC) $(CPPFLAGS) -c $(DEFS) $(INCLUDES)

indexers/trunk/mg/win32cfg.h

@@ -115 +115 @@
 /* #undef HAVE_SETBUFFER */
 
+/* Define if you have the strerror function.  */
+#define HAVE_STRERROR 1
+
 /* Define if you have the strftime function.  */
 #define HAVE_STRFTIME 1