Fixing what is needed for GCC.

Change-Id: I72e0ace3c7cc2acb22eddfc05192ec1f6f60b6ee

Author: Elbing Miss

Makefile.inc

@@ -9,16 +9,16 @@ ARCH=amd64
 
 BIN=${HARVEY}/${ARCH}/bin
 LIB=${HARVEY}/${ARCH}/lib
-AS=as
-CC=gcc
-LD=ld
+AS=x86_64-harvey-elf-as
+CC=x86_64-harvey-elf-gcc
+LD=x86_64-harvey-elf-ld
 
 IDIR=${HARVEY}/include
 IOBJDIR=${HARVEY}/${ARCH}/include
 
-CFLAGS=-O0 -static -mno-red-zone -ffreestanding -nostdinc -D_SUSV2_SOURCE -D_POSIX_SOURCE -D_LIMITS_EXTENSION ${WFLAGS} -g -I${IDIR} -I${IOBJDIR}
+CFLAGS= -std=c99 -O0 -static -mno-red-zone -ffreestanding -nostdinc -D_SUSV2_SOURCE -D_POSIX_SOURCE -D_LIMITS_EXTENSION ${WFLAGS} -g -I${IDIR} -I${IOBJDIR}
 
 WFLAGS=-Wall -Wno-missing-braces -Wno-parentheses -Wno-unknown-pragmas -Wuninitialized -Wmaybe-uninitialized 
 
-AR=ar				# manipulating libraries
+AR=x86_64-harvey-elf-ar				# manipulating libraries
 RANLIB=echo			# for updating libraries

include/arpa/inet.h

@@ -81,28 +81,28 @@ struct in_addr {
  * On subnets, the decomposition of addresses to host and net parts
  * is done according to subnet mask, not the masks here.
  */
-#define	IN_CLASSA(i)		(((int32_t)(i) & 0x80000000) == 0)
+#define	IN_CLASSA(i)		(((long)(i) & 0x80000000) == 0)
 #define	IN_CLASSA_NET		0xff000000
 #define	IN_CLASSA_NSHIFT	24
 #define	IN_CLASSA_HOST		0x00ffffff
 #define	IN_CLASSA_MAX		128
 
-#define	IN_CLASSB(i)		(((int32_t)(i) & 0xc0000000) == 0x80000000)
+#define	IN_CLASSB(i)		(((long)(i) & 0xc0000000) == 0x80000000)
 #define	IN_CLASSB_NET		0xffff0000
 #define	IN_CLASSB_NSHIFT	16
 #define	IN_CLASSB_HOST		0x0000ffff
 #define	IN_CLASSB_MAX		65536
 
-#define	IN_CLASSC(i)		(((int32_t)(i) & 0xe0000000) == 0xc0000000)
+#define	IN_CLASSC(i)		(((long)(i) & 0xe0000000) == 0xc0000000)
 #define	IN_CLASSC_NET		0xffffff00
 #define	IN_CLASSC_NSHIFT	8
 #define	IN_CLASSC_HOST		0x000000ff
 
-#define	IN_CLASSD(i)		(((int32_t)(i) & 0xf0000000) == 0xe0000000)
+#define	IN_CLASSD(i)		(((long)(i) & 0xf0000000) == 0xe0000000)
 #define	IN_MULTICAST(i)		IN_CLASSD(i)
 
-#define	IN_EXPERIMENTAL(i)	(((int32_t)(i) & 0xe0000000) == 0xe0000000)
-#define	IN_BADCLASS(i)		(((int32_t)(i) & 0xf0000000) == 0xf0000000)
+#define	IN_EXPERIMENTAL(i)	(((long)(i) & 0xe0000000) == 0xe0000000)
+#define	IN_BADCLASS(i)		(((long)(i) & 0xf0000000) == 0xf0000000)
 
 #define	INADDR_ANY		(unsigned long)0x00000000
 #define	INADDR_BROADCAST	(unsigned long)0xffffffff	/* must be masked */

include/dirent.h

@@ -20,8 +20,8 @@ struct	dirent {
 
 typedef struct _dirdesc {
 	int	dd_fd;		/* file descriptor */
-	int32_t	dd_loc;		/* buf offset of entry from last readdir() */
-	int32_t	dd_size;	/* amount of valid data in buffer */
+	long	dd_loc;		/* buf offset of entry from last readdir() */
+	long	dd_size;	/* amount of valid data in buffer */
 	char	*dd_buf;	/* directory data buffer */
 	void *dirs;
 	int	dirsize;

include/draw.h

@@ -159,9 +159,9 @@ enum {
 	XBGR32	= CHAN4(CIgnore, 8, CBlue, 8, CGreen, 8, CRed, 8),
 };
 
-extern	char*	chantostr(char*, uint32_t);
-extern	uint32_t	strtochan(char*);
-extern	int		chantodepth(uint32_t);
+extern	char*	chantostr(char*, long);
+extern	long	strtochan(char*);
+extern	int		chantodepth(long);
 
 struct	Point
 {
@@ -199,7 +199,7 @@ struct Display
 	char		*devdir;
 	char		*windir;
 	char		oldlabel[64];
-	uint32_t		dataqid;
+	long		dataqid;
 	Image		*white;
 	Image		*black;
 	Image		*opaque;
@@ -222,17 +222,17 @@ struct Image
 	Rectangle	r;		/* rectangle in data area, local coords */
 	Rectangle 	clipr;		/* clipping region */
 	int		depth;		/* number of bits per pixel */
-	uint32_t	chan;
+	long	chan;
 	int		repl;		/* flag: data replicates to tile clipr */
 	Screen		*screen;	/* 0 if not a window */
 	Image		*next;	/* next in list of windows */
 };
 
 struct RGB
 {
-	uint32_t	red;
-	uint32_t	green;
-	uint32_t	blue;
+	long	red;
+	long	green;
+	long	blue;
 };
 
 /*
@@ -304,7 +304,7 @@ struct Cacheinfo
 
 struct Cachesubf
 {
-	uint32_t		age;	/* for replacement */
+	long		age;	/* for replacement */
 	Cachefont	*cf;	/* font info that owns us */
 	Subfont		*f;	/* attached subfont */
 };
@@ -317,7 +317,7 @@ struct Font
 	int16_t		ascent;	/* top of image to baseline */
 	int16_t		width;	/* widest so far; used in caching only */	
 	int16_t		nsub;	/* number of subfonts */
-	uint32_t		age;	/* increasing counter; used for LRU */
+	long		age;	/* increasing counter; used for LRU */
 	int		maxdepth;	/* maximum depth of all loaded subfonts */
 	int		ncache;	/* size of cache */
 	int		nsubf;	/* size of subfont list */
@@ -337,10 +337,10 @@ extern "C" {
 /*
  * Image management
  */
-extern Image*	_allocimage(Image*, Display*, Rectangle, uint32_t, int,
-				 uint32_t, int, int);
-extern Image*	allocimage(Display*, Rectangle, uint32_t, int,
-				uint32_t);
+extern Image*	_allocimage(Image*, Display*, Rectangle, long, int,
+				 long, int, int);
+extern Image*	allocimage(Display*, Rectangle, long, int,
+				long);
 extern uint8_t*	bufimage(Display*, int);
 extern int	bytesperline(Rectangle, int);
 extern void	closedisplay(Display*);
@@ -365,25 +365,25 @@ extern int	wordsperline(Rectangle, int);
 extern int	writeimage(int, Image*, int);
 extern Image*	namedimage(Display*, char*);
 extern int	nameimage(Image*, char*, int);
-extern Image* allocimagemix(Display*, uint32_t, uint32_t);
+extern Image* allocimagemix(Display*, long, long);
 
 /*
  * Colors
  */
 extern	void	readcolmap(Display*, RGB*);
 extern	void	writecolmap(Display*, RGB*);
-extern	uint32_t	setalpha(uint32_t, uint8_t);
+extern	long	setalpha(long, uint8_t);
 
 /*
  * Windows
  */
 extern Screen*	allocscreen(Image*, Image*, int);
-extern Image*	_allocwindow(Image*, Screen*, Rectangle, int, uint32_t);
-extern Image*	allocwindow(Screen*, Rectangle, int, uint32_t);
+extern Image*	_allocwindow(Image*, Screen*, Rectangle, int, long);
+extern Image*	allocwindow(Screen*, Rectangle, int, long);
 extern void	bottomnwindows(Image**, int);
 extern void	bottomwindow(Image*);
 extern int	freescreen(Screen*);
-extern Screen*	publicscreen(Display*, int, uint32_t);
+extern Screen*	publicscreen(Display*, int, long);
 extern void	topnwindows(Image**, int);
 extern void	topwindow(Image*);
 extern int	originwindow(Image*, Point, Point);
@@ -511,7 +511,7 @@ extern Subfont*	_getsubfont(Display*, char*);
 extern Subfont*	getdefont(Display*);
 extern void		lockdisplay(Display*);
 extern void	unlockdisplay(Display*);
-extern int		drawlsetrefresh(uint32_t, int, void*, void*);
+extern int		drawlsetrefresh(long, int, void*, void*);
 
 /*
  * Predefined 
@@ -549,7 +549,7 @@ extern	void	_twiddlecompressed(uint8_t*, int);
 extern	int	_compblocksize(Rectangle, int);
 
 /* XXX backwards helps; should go */
-extern	uint32_t	drawld2chan[];
+extern	long	drawld2chan[];
 extern	void		drawsetdebug(int);
 
 #ifdef	__cplusplus

include/fcntl.h

@@ -41,8 +41,8 @@
 #define FD_CLOEXEC	1
 
 struct flock {
-	int16_t	l_type;
-	int16_t	l_whence;
+	short	l_type;
+	short	l_whence;
 	off_t	l_start;
 	off_t	l_len;
 	pid_t	l_pid;

include/inttypes.h

@@ -14,20 +14,12 @@
 #ifndef _INTTYPES_H_
 #define _INTTYPES_H_ 1
 
-typedef int _intptr_t;
+typedef long long _intptr_t;
 typedef unsigned long long _uintptr_t;
 
-
-typedef signed char int8_t;
-typedef int int32_t;
-typedef long long int64_t;
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
 typedef _intptr_t intptr_t;
 typedef _uintptr_t uintptr_t;
-typedef int64_t	intmax_t;
-typedef uint64_t	uintmax_t;
+typedef long long	intmax_t;
+typedef unsigned long long	uintmax_t;
 
 #endif