diff options
| author | Peter Jones <pjones@redhat.com> | 2007-10-18 15:51:48 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2007-10-18 15:51:48 +0000 |
| commit | 2665bcb384d9018404347c48257b4448b9e47de6 (patch) | |
| tree | d1ed54be1568b8bc0ed42dfba4e18594b4cd7688 /gptsync | |
| parent | cfde095284266ba856f14a682cea2c56ba2bb91b (diff) | |
| download | anaconda-2665bcb384d9018404347c48257b4448b9e47de6.tar.gz anaconda-2665bcb384d9018404347c48257b4448b9e47de6.tar.xz anaconda-2665bcb384d9018404347c48257b4448b9e47de6.zip | |
- fix gptsync types on x86_64.
Diffstat (limited to 'gptsync')
| -rw-r--r-- | gptsync/Makefile | 23 | ||||
| -rw-r--r-- | gptsync/gptsync.h | 9 |
2 files changed, 18 insertions, 14 deletions
diff --git a/gptsync/Makefile b/gptsync/Makefile index 8cc91dd51..c08a7745d 100644 --- a/gptsync/Makefile +++ b/gptsync/Makefile @@ -3,27 +3,30 @@ # -TARGETS = gptsync showpart -OBJS = showpart.c lib.c os_unix.c gptsync.c +TARGETS = gptsync showpart +OBJS = showpart.c lib.c os_unix.c gptsync.c -CPPFLAGS = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -CFLAGS = -Wall -Werror -LDFLAGS = -LIBS = -CC = gcc +CPPFLAGS = $(CFLAGS) +#CPPFLAGS = $(shell echo $(CFLAGS) | sed -e 's/-O2/-O0/g' -e 's/-g /-ggdb3 /g') +CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +LDFLAGS = +LIBS = +CC = gcc + +include ../Makefile.inc # real making all: $(TARGETS) gptsync: gptsync.o lib.o - $(CC) $(LDFLAGS) -DPROGNAME=$@ -o $@ os_unix.c $^ $(LIBS) + $(CC) $(CPPFLAGS) $(LDFLAGS) -DPROGNAME=$@ -o $@ os_unix.c $^ $(LIBS) showpart: showpart.o lib.o - $(CC) $(LDFLAGS) -DPROGNAME=$@ -o $@ os_unix.c $^ $(LIBS) + $(CC) $(CPPFLAGS) $(LDFLAGS) -DPROGNAME=$@ -o $@ os_unix.c $^ $(LIBS) %.o: %.c - $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + $(CC) $(CPPFLAGS) -c -o $@ $< # cleanup diff --git a/gptsync/gptsync.h b/gptsync/gptsync.h index 8bb5da4dc..d1bf3c20e 100644 --- a/gptsync/gptsync.h +++ b/gptsync/gptsync.h @@ -65,6 +65,7 @@ typedef CHAR16 CHARN; #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdint.h> #include <unistd.h> #include <errno.h> @@ -75,10 +76,10 @@ typedef CHAR16 CHARN; typedef int INTN; typedef unsigned int UINTN; -typedef unsigned char UINT8; -typedef unsigned short UINT16; -typedef unsigned long UINT32; -typedef unsigned long long UINT64; +typedef uint8_t UINT8; +typedef uint16_t UINT16; +typedef uint32_t UINT32; +typedef uint64_t UINT64; typedef void VOID; typedef int BOOLEAN; |