Changeset 26654 for main/trunk/greenstone2

Timestamp:

2013-01-10T15:37:15+13:00 (11 years ago)

Author:

davidb

Message:

Edits to support cross-compilation using mingw under Linux to generate Windows binaries

Location:

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3

Files:

• Makefile.in (modified) (1 diff)
• gdbm.proto (modified) (1 diff)
• gdbmdefs.h (modified) (1 diff)

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/Makefile.in

@@ -30 +30 @@
 LDFLAGS = @LDFLAGS@ @ARCH_DEP_FLAGS@
 
-ifeq ($(GSDLOS), "windows")
+ifeq ($(GSDLOS),windows)
   # Let MinGW/MSys tap into Windows code for GDBM
   CFLAGS += -DMSDOS

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/gdbm.proto

@@ -83 +83 @@
 /* These are the routines! */
 
+#ifdef MSDOS
+extern GDBM_FILE gdbm_open __P((char *, int, int, int, void (*)(),int));
+#else
 extern GDBM_FILE gdbm_open __P((char *, int, int, int, void (*)()));
+#endif
+
 extern void gdbm_close __P((GDBM_FILE));
 extern int gdbm_store __P((GDBM_FILE, datum, datum, int));

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/gdbmdefs.h

@@ -33 +33 @@
    The following ensures that we use the same for all systems, and so lets
    GDBM read the same database files */
-#if defined __unix__ || defined __APPLE__
+#if defined __unix__ || defined __APPLE__ || defined __MINGW32__
 #include <stdint.h>
 #else