Eliminate uint32n, int32n

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@732 9d0c8265-081b-0410-96cb-a4ca84ce46f8

4 files changed, 6 insertions, 14 deletions

diff --git a/converter/other/pamtodjvurle.c b/converter/other/pamtodjvurle.c
index ae35e81d..fecf410e 100644
--- a/converter/other/pamtodjvurle.c
+++ b/converter/other/pamtodjvurle.c
@@ -179,7 +179,7 @@ writeRleRun(FILE *       const ofP,
   
   'transcolor' is a 3-deep tuple with the same maxval as the image.
 -----------------------------------------------------------------------------*/
-    uint32n rlevalue;         /* RLE-encoded color/valuex */
+    uint32_t rlevalue;         /* RLE-encoded color/valuex */
     int index;
 
     if (count > 0) {
diff --git a/converter/other/x11wd.h b/converter/other/x11wd.h
index 711248f5..7161260b 100644
--- a/converter/other/x11wd.h
+++ b/converter/other/x11wd.h
@@ -27,7 +27,7 @@ enum visualclass {StaticGray=0,GrayScale=1,StaticColor=2,PseudoColor=3,
 #define DirectColor 5
 */
 
-typedef uint32n xwdval;
+typedef uint32_t xwdval;
 #define XWDVAL_MAX ((xwdval)(-1))
 #define X11WD_FILE_VERSION 7
 typedef struct {
@@ -67,13 +67,13 @@ typedef struct {
         */
     xwdval window_width;    /* Window width */
     xwdval window_height;   /* Window height */
-    int32n window_x;        /* Window upper left X coordinate */
-    int32n window_y;        /* Window upper left Y coordinate */
+    int32_t window_x;        /* Window upper left X coordinate */
+    int32_t window_y;        /* Window upper left Y coordinate */
     xwdval window_bdrwidth; /* Window border width */
     } X11WDFileHeader;
 
 typedef struct {
-    uint32n num;
+    uint32_t num;
     unsigned short red, green, blue;
     char flags;         /* do_red, do_green, do_blue */
     char pad;
diff --git a/lib/pmfileio.c b/lib/pmfileio.c
index 0ec5f87e..8af085b7 100644
--- a/lib/pmfileio.c
+++ b/lib/pmfileio.c
@@ -700,7 +700,7 @@ pm_read_unknown_size(FILE * const file,
 
 
 union cheat {
-    uint32n l;
+    uint32_t l;
     short s;
     unsigned char c[4];
 };
diff --git a/pm_config.in.h b/pm_config.in.h
index bb3bf381..cbc9348c 100644
--- a/pm_config.in.h
+++ b/pm_config.in.h
@@ -111,14 +111,6 @@ extern int rand();
 
 #endif /*SYSV or Amiga*/
 
-/* We should change all of Netpbm to use uint32_t instead of uint32n,
-   because we now have a strategy for ensuring that uint32_t is defined.
-   But we're going to wait a while in case our uint32_t strategy doesn't
-   work.  04.08.24.
-*/
-typedef uint32_t uint32n;
-typedef int32_t int32n;
-
 /* CONFIGURE: On most BSD systems, malloc() gets declared in stdlib.h, on
 ** system V, it gets declared in malloc.h. On some systems, malloc.h
 ** doesn't declare these, so we have to do it here. On other systems,