jbig2dec

Update of /cvsroot/jbig2dec/jbig2dec
In directory usw-pr-cvs1:/tmp/cvs-serv32596

Modified Files:
	jbig2.c jbig2_arith.c jbig2_arith_iaid.c jbig2_arith_int.c 
	jbig2_generic.c jbig2_huffman.c jbig2_image.c 
	jbig2_image_pbm.c jbig2_image_png.c jbig2_mmr.c jbig2_page.c 
	jbig2_segment.c jbig2_symbol_dict.c jbig2_text.c jbig2dec.c 
	sha1.c 
Added Files:
	os_types.h 
Log Message:
move repeated configuration includes to a new os_types.h

--- NEW FILE: os_types.h ---
/*
    jbig2dec
    
    Copyright (c) 2002 artofcode LLC.
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
        
    $Id: os_types.h,v 1.1 2002/07/20 17:23:15 giles Exp $
*/

/*
   indirection layer for build and platform-specific definitions

   in general, this header should insure that the stdint types are
   available, and that any optional compile flags are defined if
   the build system doesn't pass them directly.
*/

#ifdef HAVE_CONFIG_H
#include "config_types.h"
#elif defined(_WIN32)
#include "config_win32.h"
#endif

#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif

Index: jbig2.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jbig2.c	8 Jul 2002 19:21:35 -0000	1.15
+++ jbig2.c	20 Jul 2002 17:23:15 -0000	1.16
@@ -13,13 +13,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
+#endif 
+#include "os_types.h"
 
 #include <stdio.h>
 #include <stdlib.h>

Index: jbig2_arith.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_arith.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jbig2_arith.c	8 Jul 2002 14:54:01 -0000	1.10
+++ jbig2_arith.c	20 Jul 2002 17:23:15 -0000	1.11
@@ -13,13 +13,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
 #endif
+#include "os_types.h"
 
 #include <stdio.h>
 #include <stdlib.h>

Index: jbig2_arith_iaid.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_arith_iaid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jbig2_arith_iaid.c	8 Jul 2002 14:54:01 -0000	1.4
+++ jbig2_arith_iaid.c	20 Jul 2002 17:23:15 -0000	1.5
@@ -2,13 +2,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
+#endif 
+#include "os_types.h"
 
 #include <stddef.h>
 #include <string.h> /* memset() */

Index: jbig2_arith_int.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_arith_int.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jbig2_arith_int.c	8 Jul 2002 14:54:01 -0000	1.5
+++ jbig2_arith_int.c	20 Jul 2002 17:23:15 -0000	1.6
@@ -2,13 +2,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
+#endif 
+#include "os_types.h"
 
 #include <stddef.h>
 #include <string.h> /* memset() */

Index: jbig2_generic.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_generic.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jbig2_generic.c	8 Jul 2002 14:54:01 -0000	1.12
+++ jbig2_generic.c	20 Jul 2002 17:23:15 -0000	1.13
@@ -17,13 +17,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
+#endif 
+#include "os_types.h"
 
 #include <stddef.h>
 #include <string.h> /* memcpy(), memset() */

Index: jbig2_huffman.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_huffman.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jbig2_huffman.c	8 Jul 2002 14:54:01 -0000	1.10
+++ jbig2_huffman.c	20 Jul 2002 17:23:15 -0000	1.11
@@ -16,13 +16,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
+#endif 
+#include "os_types.h"
 
 #include <stdlib.h>
 

Index: jbig2_image.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_image.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jbig2_image.c	8 Jul 2002 14:54:01 -0000	1.18
+++ jbig2_image.c	20 Jul 2002 17:23:15 -0000	1.19
@@ -13,13 +13,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
+#endif 
+#include "os_types.h"
 
 #include <stdio.h>
 #include <stdlib.h>

Index: jbig2_image_pbm.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_image_pbm.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jbig2_image_pbm.c	8 Jul 2002 14:54:01 -0000	1.9
+++ jbig2_image_pbm.c	20 Jul 2002 17:23:15 -0000	1.10
@@ -13,13 +13,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
+#endif 
+#include "os_types.h"
 
 #include <stdio.h>
 #include <ctype.h>

Index: jbig2_image_png.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_image_png.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jbig2_image_png.c	8 Jul 2002 14:54:01 -0000	1.5
+++ jbig2_image_png.c	20 Jul 2002 17:23:15 -0000	1.6
@@ -13,13 +13,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
+#endif 
+#include "os_types.h"
 
 #include <stdio.h>
 #include <stdlib.h>

Index: jbig2_mmr.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_mmr.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jbig2_mmr.c	17 Jul 2002 13:52:53 -0000	1.8
+++ jbig2_mmr.c	20 Jul 2002 17:23:15 -0000	1.9
@@ -4,13 +4,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
+#endif 
+#include "os_types.h"
 
 #include <stddef.h>
 #include <stdio.h>

Index: jbig2_page.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_page.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jbig2_page.c	9 Jul 2002 09:45:32 -0000	1.12
+++ jbig2_page.c	20 Jul 2002 17:23:15 -0000	1.13
@@ -13,13 +13,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
+#endif 
+#include "os_types.h"
 
 #include <stdlib.h>
 

Index: jbig2_segment.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_segment.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jbig2_segment.c	9 Jul 2002 09:45:32 -0000	1.17
+++ jbig2_segment.c	20 Jul 2002 17:23:15 -0000	1.18
@@ -13,13 +13,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
+#endif 
+#include "os_types.h"
 
 #include <stddef.h> /* size_t */
 

Index: jbig2_symbol_dict.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_symbol_dict.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jbig2_symbol_dict.c	9 Jul 2002 10:13:13 -0000	1.17
+++ jbig2_symbol_dict.c	20 Jul 2002 17:23:15 -0000	1.18
@@ -15,13 +15,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
+#endif 
+#include "os_types.h"
 
 #include <stddef.h>
 #include <string.h> /* memset() */

Index: jbig2_text.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_text.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jbig2_text.c	13 Jul 2002 00:32:43 -0000	1.15
+++ jbig2_text.c	20 Jul 2002 17:23:15 -0000	1.16
@@ -13,13 +13,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
+#endif 
+#include "os_types.h"
 
 #include <stddef.h>
 #include <string.h> /* memset() */

Index: jbig2dec.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2dec.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jbig2dec.c	20 Jul 2002 16:02:24 -0000	1.36
+++ jbig2dec.c	20 Jul 2002 17:23:15 -0000	1.37
@@ -13,12 +13,6 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif _WIN32
-#include "config_win32.h"
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
 #endif
 
 #include <stdio.h>
@@ -26,16 +20,17 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "jbig2.h"
-#include "jbig2_image.h"
-
 #ifdef HAVE_GETOPT_H
 # include <getopt.h>
 #else
 # include "getopt.h"
 #endif
 
+#include "os_types.h"
 #include "sha1.h"
+
+#include "jbig2.h"
+#include "jbig2_image.h"
 
 typedef enum {
     usage,dump,render

Index: sha1.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/sha1.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sha1.c	20 Jul 2002 16:19:33 -0000	1.4
+++ sha1.c	20 Jul 2002 17:23:15 -0000	1.5
@@ -80,18 +80,12 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "config_types.h"
-#elif defined(_WIN32)
-#include "config_win32.h"
 #endif
 
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
+#include "os_types.h"
 #include "sha1.h"
 
 void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64]);