rev 462 - trunk

Author: giles
Date: 2008-05-09 06:38:29 -0700 (Fri, 09 May 2008)
New Revision: 462

Modified:
   trunk/config_win32.h
   trunk/msvc.mak
   trunk/os_types.h
Log:
Windows build fixes. Patch from Ghostscript trunk.


Modified: trunk/config_win32.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/config_win32.h	2008-05-07 21:37:02 UTC (rev 461)
+++ trunk/config_win32.h	2008-05-09 13:38:29 UTC (rev 462)
@@ -22,8 +22,8 @@
 #define PACKAGE "jbig2dec"
 #define VERSION "0.3"
=20
-#ifdef _MSC_VER /* Microsoft Visual C+*/
-
+#if defined(_MSC_VER) || (defined(__BORLANDC__) && defined(__WIN32__))
+  /* Microsoft Visual C++ or Borland C++ */
   typedef signed char             int8_t;
   typedef short int               int16_t;
   typedef int                     int32_t;

Modified: trunk/msvc.mak
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/msvc.mak	2008-05-07 21:37:02 UTC (rev 461)
+++ trunk/msvc.mak	2008-05-09 13:38:29 UTC (rev 462)
@@ -12,19 +12,19 @@
 ZLIBDIR=3D../zlib
 # define iff you're linking to libpng
 LIBPNG_CFLAGS=3D-DHAVE_LIBPNG -I$(LIBPNGDIR) -I$(ZLIBDIR)
-LIBPNG_LDFLAGS=3D$(LIBPNGDIR)/libpng.lib $(ZLIBDIR)/zlib.lib
+LIBPNG_LDFLAGS=3D$(LIBPNGDIR)/libpng.lib $(ZLIBDIR)/zlib.lib /link /NODE=
FAULTLIB:LIBCMT
 #LIBPNG_CFLAGS=3D
 #LIBPNG_LDFLAGS=3D
=20
 EXE=3D.exe
 OBJ=3D.obj
 NUL=3D
-CFLAGS=3D-nologo -W4 -Zi -DHAVE_STRING_H=3D1 $(LIBPNG_CFLAGS)
+CFLAGS=3D-nologo -W4 -Zi -DHAVE_STRING_H=3D1 -D_CRT_SECURE_NO_WARNINGS $=
(LIBPNG_CFLAGS)=20
 CC=3Dcl
 FE=3D-Fe
=20
 OBJS=3Dgetopt$(OBJ) getopt1$(OBJ) jbig2$(OBJ) jbig2_arith$(OBJ) \
- jbig2_arith_iaid$(OBJ) jbig2_arith_int$(OBJ) jbig2_huffman$(OBJ) \=20
+ jbig2_arith_iaid$(OBJ) jbig2_arith_int$(OBJ) jbig2_huffman$(OBJ) \
  jbig2_generic$(OBJ) jbig2_refinement$(OBJ) \
  jbig2_image$(OBJ) jbig2_image_pbm$(OBJ) jbig2_image_png$(OBJ) \
  jbig2_segment$(OBJ) jbig2_symbol_dict$(OBJ) jbig2_text$(OBJ) \
@@ -39,7 +39,7 @@
 all: jbig2dec$(EXE)
=20
 jbig2dec$(EXE): $(OBJS)
-	$(CC) $(CFLAGS) $(FE)jbig2dec$(EXE) $(OBJS) $(LIBPNG_LDFLAGS)
+	$(CC) $(CFLAGS) $(FE)jbig2dec$(EXE) $(OBJS) $(LIBPNG_LDFLAGS)=20
=20
 getopt$(OBJ): getopt.c getopt.h
 	$(CC) $(CFLAGS) -c getopt.c

Modified: trunk/os_types.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/os_types.h	2008-05-07 21:37:02 UTC (rev 461)
+++ trunk/os_types.h	2008-05-09 13:38:29 UTC (rev 462)
@@ -41,7 +41,7 @@
 #endif
 #elif defined(HAVE_CONFIG_H)
 # include "config_types.h"
-#elif defined(_WIN32)
+#elif defined(_WIN32) || defined(__WIN32__)=20
 # include "config_win32.h"
 #endif
=20