Changeset 2626

Timestamp:

2001-07-06T11:50:06+12:00 (23 years ago)

Author:

sjboddie

Message:

A couple of minor changes to avoid compiler problems with VC++ on
Windows 95

Location:

trunk/gsdl

Files:

• packages/mg/sysfuncs.h (modified) (1 diff)
• src/colservr/win32.mak (modified) (1 diff)

trunk/gsdl/packages/mg/sysfuncs.h

@@ -124 +124 @@
 #endif /* not STDC_HEADERS and HAVE_MEMORY_H */
 #ifndef index
-#define index strchr
+/*#define index strchr 
+ *
+ * this is stuffing up our code so its commented out */
 #endif
 #ifndef rindex

trunk/gsdl/src/colservr/win32.mak

@@ -35 +35 @@
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX
 INCLUDES = -I"$(GSDLHOME)" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\src\colservr" \
-       -I"$(GSDLHOME)\src\mgpp\lib" -I"$(GSDLHOME)\src\mgpp\text" \
        -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\packages\mg" \
        -I"$(GSDLHOME)\packages\mg\lib" -I"$(GSDLHOME)\packages\mg\src\text" \
-       -I"$(GSDLHOME)\packages\windows\gdbm\gdbm"
+       -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \
+       -I"$(GSDLHOME)\src\mgpp\lib" -I"$(GSDLHOME)\src\mgpp\text"
+
 !IF $(USE_STLPORT)
 DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS