summaryrefslogtreecommitdiff
path: root/output
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-04-12 16:54:50 +0000
committerH. Peter Anvin <hpa@zytor.com>2007-04-12 16:54:50 +0000
commit038d861eded9bfc75529e23ba8d5d6edd5e3ef98 (patch)
tree8383e607cb9bdcba3beef5d831e8a0f6e175f28c /output
parent2030bd21f4923d4ddd4c093f8756451fc35220f8 (diff)
downloadnasm-038d861eded9bfc75529e23ba8d5d6edd5e3ef98.tar.gz
nasm-038d861eded9bfc75529e23ba8d5d6edd5e3ef98.tar.bz2
nasm-038d861eded9bfc75529e23ba8d5d6edd5e3ef98.zip
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.
Diffstat (limited to 'output')
-rw-r--r--output/outrdf2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/output/outrdf2.c b/output/outrdf2.c
index e0d9f80..35be04d 100644
--- a/output/outrdf2.c
+++ b/output/outrdf2.c
@@ -72,8 +72,8 @@ static efunc error;
static struct seginfo {
int8_t *segname;
int segnumber;
- uint16 segtype;
- uint16 segreserved;
+ uint16_t segtype;
+ uint16_t segreserved;
int32_t seglength;
} segments[RDF_MAXSEGS];
@@ -225,7 +225,7 @@ static void write_reloc_rec(struct RelocRec *r)
{
int8_t buf[4], *b;
- if (r->refseg != (uint16) NO_SEG && (r->refseg & 1)) /* segment base ref */
+ if (r->refseg != (uint16_t) NO_SEG && (r->refseg & 1)) /* segment base ref */
r->type = RDFREC_SEGRELOC;
r->refseg >>= 1; /* adjust segment nos to RDF rather than NASM */
@@ -351,7 +351,7 @@ static void rdf2_deflabel(int8_t *name, int32_t segment, int32_t offset,
struct CommonRec ci;
static int farsym = 0;
static int i;
- byte symflags = 0;
+ uint8_t symflags = 0;
int len;
/* Check if the label length is OK */