--- a/src/broken-sun.h	Mon Aug 13 10:27:41 2007 +0200
+++ b/src/broken-sun.h	Mon Aug 13 10:28:48 2007 +0200
@@ -34,135 +34,135 @@
 
 /*********************** stdlib functions *********************/
 
-/* extern void *	memchr (CONST void *, int, size_t); */
+/* void *	memchr (CONST void *, int, size_t); */
 
-/* extern int	memcmp (CONST void *, CONST void *, size_t); */
-/* extern void *	memcpy (void *, CONST void *, size_t); */
-/* extern void *	memmove (void *, CONST void *, size_t);*/
-/* extern void *	memset (void *, int, int); */
-/* extern char *	strcat (char *, CONST char *); */
-/* extern char *	strchr (CONST char *, int); */
-/* extern int	strcmp (CONST char *, CONST char *); */
-extern int	strcasecmp (char *, char *);
-extern void	bzero (char *, int);
-extern void	bcopy (char *, char *, int);
+/* int	memcmp (CONST void *, CONST void *, size_t); */
+/* void *	memcpy (void *, CONST void *, size_t); */
+/* void *	memmove (void *, CONST void *, size_t);*/
+/* void *	memset (void *, int, int); */
+/* char *	strcat (char *, CONST char *); */
+/* char *	strchr (CONST char *, int); */
+/* int	strcmp (CONST char *, CONST char *); */
+int	strcasecmp (char *, char *);
+void	bzero (char *, int);
+void	bcopy (char *, char *, int);
 
 /* Yes, they even left these functions out! */
-extern int      tolower (int);
-extern int      toupper (int);
+int      tolower (int);
+int      toupper (int);
 
 /*********************** stdio functions *********************/
 
 #include <stdio.h> /* else can't declare FILE */
 
-/* extern FILE	*fopen (CONST char *, CONST char *); */
-/* extern FILE	*freopen (CONST char *, CONST char *, FILE *); */
-extern FILE	*tmpfile (void);
-extern int	fclose (FILE *);
-extern char	*fgets (char *, int, FILE *);
-extern int      fgetc (FILE *);
-extern int      fflush (FILE *);
-extern int      fprintf (FILE *, CONST char *, ...);
-extern int      fputc (char, FILE *);
-extern int      fputs (CONST char *, FILE *);
-extern size_t   fread (void *, size_t, size_t, FILE *);
-extern int      fscanf (FILE *, CONST char *, ...);
-extern int	fgetpos (FILE *, long *);
-extern int      fseek (FILE *, long, int);
-extern int	fsetpos (FILE *, CONST long *);
-extern long     ftell (FILE *);
-extern size_t   fwrite (CONST void *, size_t, size_t, FILE *);
-extern char	*gets (char *);
-extern int	pclose (FILE *);
-extern void     perror (CONST char *);
-extern int      printf (CONST char *, ...);
-extern int      puts (CONST char *);
-extern int      remove (CONST char *);
-extern int      rename (CONST char *, CONST char *);
-extern int      rewind (FILE *);
-extern int	scanf (CONST char *, ...);
-extern int	sscanf (CONST char *, CONST char *, ...);
-extern void 	setbuf (FILE *, char *);
-extern int 	setvbuf (FILE *, char *, int, size_t);
-extern int	ungetc (int, FILE *);
-extern int	vprintf (CONST char *, void *);
-extern int	vfprintf (FILE *, CONST char *, void *);
-extern char	*vsprintf (char *, CONST char *, void *);
+/* FILE	*fopen (CONST char *, CONST char *); */
+/* FILE	*freopen (CONST char *, CONST char *, FILE *); */
+FILE	*tmpfile (void);
+int	fclose (FILE *);
+char	*fgets (char *, int, FILE *);
+int      fgetc (FILE *);
+int      fflush (FILE *);
+int      fprintf (FILE *, CONST char *, ...);
+int      fputc (char, FILE *);
+int      fputs (CONST char *, FILE *);
+size_t   fread (void *, size_t, size_t, FILE *);
+int      fscanf (FILE *, CONST char *, ...);
+int	fgetpos (FILE *, long *);
+int      fseek (FILE *, long, int);
+int	fsetpos (FILE *, CONST long *);
+long     ftell (FILE *);
+size_t   fwrite (CONST void *, size_t, size_t, FILE *);
+char	*gets (char *);
+int	pclose (FILE *);
+void     perror (CONST char *);
+int      printf (CONST char *, ...);
+int      puts (CONST char *);
+int      remove (CONST char *);
+int      rename (CONST char *, CONST char *);
+int      rewind (FILE *);
+int	scanf (CONST char *, ...);
+int	sscanf (CONST char *, CONST char *, ...);
+void 	setbuf (FILE *, char *);
+int 	setvbuf (FILE *, char *, int, size_t);
+int	ungetc (int, FILE *);
+int	vprintf (CONST char *, void *);
+int	vfprintf (FILE *, CONST char *, void *);
+char	*vsprintf (char *, CONST char *, void *);
 
 /*********************** signal functions *********************/
 
-extern int	sigblock (int);
+int	sigblock (int);
 #ifndef sigmask
-extern int	sigmask (int);
+int	sigmask (int);
 #endif
-extern int	sigsetmask (int);
-extern int	sigpause (int);
+int	sigsetmask (int);
+int	sigpause (int);
 
 /*********************** time functions ***********************/
 
 struct timeval;
 struct timezone;
 
-extern int	utimes (CONST char *, struct timeval *);
-extern void	tzset (void);
-extern time_t	time (time_t *);
-extern int	gettimeofday (struct timeval *, struct timezone *);
+int	utimes (CONST char *, struct timeval *);
+void	tzset (void);
+time_t	time (time_t *);
+int	gettimeofday (struct timeval *, struct timezone *);
 
 /*********************** file-system functions *********************/
 
 struct stat;
 #include </usr/include/sys/types.h>
 
-extern int	fsync (int);
-extern int	lstat (CONST char *, struct stat *);
-extern int	fchmod (int, mode_t);
-extern char	*mktemp (char *);
-/* extern int	creat (CONST char *, mode_t); better no decl than a conflicting one... */
-extern int	symlink (CONST char *, CONST char *);
-extern int	readlink (CONST char *, char *, int);
-extern void	sync (void);
-extern int	select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
-extern char *	getwd (char *);
-/* extern int	lseek (int, long, int); better no decl than a conflicting one... */
-extern int	_filbuf ();
-extern int	_flsbuf ();
+int	fsync (int);
+int	lstat (CONST char *, struct stat *);
+int	fchmod (int, mode_t);
+char	*mktemp (char *);
+/* int	creat (CONST char *, mode_t); better no decl than a conflicting one... */
+int	symlink (CONST char *, CONST char *);
+int	readlink (CONST char *, char *, int);
+void	sync (void);
+int	select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
+char *	getwd (char *);
+/* int	lseek (int, long, int); better no decl than a conflicting one... */
+int	_filbuf ();
+int	_flsbuf ();
 
 /**************** interprocess communication functions ******************/
 
-extern int	recv (int, char *, int, int);
-extern int	socket (int, int, int);
+int	recv (int, char *, int, int);
+int	socket (int, int, int);
 struct sockaddr;
-extern int	connect (int, struct sockaddr *, int);
-extern int	bind (int, struct sockaddr *, int);
-extern int	listen (int, int);
-extern int	accept (int, struct sockaddr *, int *);
-extern int	gethostname (char *, int);
+int	connect (int, struct sockaddr *, int);
+int	bind (int, struct sockaddr *, int);
+int	listen (int, int);
+int	accept (int, struct sockaddr *, int *);
+int	gethostname (char *, int);
 struct rusage;
-extern int	wait3 (void *, int, struct rusage *);
-extern int	nice (int);
-extern int	killpg (int, int);
-extern int	system (char *);
+int	wait3 (void *, int, struct rusage *);
+int	nice (int);
+int	killpg (int, int);
+int	system (char *);
 
 
 /*********************** low-level OS functions *********************/
 
-extern int	ioctl (int, int, ...);
+int	ioctl (int, int, ...);
 struct nlist;
-extern int	nlist (CONST char *, struct nlist *);
-extern int	munmap (void *, int);
-extern int	brk (void *);
-extern void *	sbrk (int);
+int	nlist (CONST char *, struct nlist *);
+int	munmap (void *, int);
+int	brk (void *);
+void *	sbrk (int);
 struct rlimit;
-extern int	getrlimit (int, struct rlimit *);
-extern int	getpagesize (void);
-extern int	shutdown (int, int);
-extern int	mprotect (void *, int, int);
+int	getrlimit (int, struct rlimit *);
+int	getpagesize (void);
+int	shutdown (int, int);
+int	mprotect (void *, int, int);
 
 /*********************** miscellaneous functions *********************/
 
-extern void	tputs (CONST char *cp, int affcnt, void (*)(int));
-extern long	random (void);
-extern int	srandom (int seed);
+void	tputs (CONST char *cp, int affcnt, void (*)(int));
+long	random (void);
+int	srandom (int seed);
 
 #endif /* __GNUC__ */