Remove obsolete types; add <inttypes.h> where needed; header fixes

- Remove obsolete types like "uint32"; use "uint32_t" consistently.
- Make sure we include <inttypes.h> where needed.
- Header file guards should be FOO_H or SUBDIR_FOO_H; _FOO_H infringes
  on the C implementation's namespace and should only be used when
  writing libc!
- Change a few "int8_t" back to "char" where appropriate.  There are
  a lot more places where that should be done, though.
- Clean up the check for getuid/getgid in rdoff/rdlar.h.

1 files changed, 11 insertions, 7 deletions

diff --git a/rdoff/ldsegs.h b/rdoff/ldsegs.h
index 038bb394..83ce71ba 100644
--- a/rdoff/ldsegs.h
+++ b/rdoff/ldsegs.h
@@ -3,15 +3,17 @@
  *		types of segment. This may be useful in other contexts also.
  */
 
-#ifndef UI16
-#define UI16 uint16_t
-#endif
+#ifndef RDOFF_LDSEGS_H
+#define RDOFF_LDSEGS_H 1
+
+#include <inttypes.h>
 
 struct segconfig {
-    UI16 typelow, typehi;       /* range of seg nos for which this is valid */
-    int8_t *typedesc;             /* a description of the segment type */
-    UI16 dowhat;                /* one of the SEG_xxxx values below */
-    UI16 mergetype;             /* if SEG_MERGE what type segment do we merge with?
+    uint16_t typelow, typehi;	/* range of seg nos for which this is valid */
+    int8_t *typedesc;		/* a description of the segment type */
+    uint16_t dowhat;		/* one of the SEG_xxxx values below */
+    uint16_t mergetype;		/* if SEG_MERGE what type segment do we merge
+				   with?
                                    0 -> same type of segment. This type is also
                                    used with SEG_NEWSEG. */
 };
@@ -54,3 +56,5 @@ struct segconfig sconft[SEGCONFIGMAX] = {
           exit(1);						\
        }							\
     }
+
+#endif