Now use EXFUN rather than PROTO, so that things using ansidecl.h and

not bfd.h can use them

diff --git a/bfd/hosts/amix.h b/bfd/hosts/amix.h
index 1dd5cc9..ed0a1db 100644 (file)
--- a/bfd/hosts/amix.h
+++ b/bfd/hosts/amix.h
@@ -19,18 +19,18 @@
 #define POSIX_UTIME
 #define HAVE_PROCFS    /* This host has /proc support */
 
-extern PROTO(void, abort,(void));
-extern PROTO(int,  close,(int));
-extern PROTO(void, exit,(int));
-extern PROTO(int,  fclose,(FILE*));
-extern PROTO(void, free,(PTR));
-extern PROTO(int,  fseek,(FILE*, long, int));
-extern PROTO(int,  getgid,());
-extern PROTO(int,  getuid,());
-extern PROTO(PTR,  malloc,(unsigned));
-extern PROTO(void, perror,(CONST char *));
-extern PROTO(int,  qsort,(void *data,int els, int siz, int func()));
-extern PROTO(PTR,  realloc, (PTR, unsigned));
+extern void EXFUN( abort,(void));
+extern int EXFUN(  close,(int));
+extern void EXFUN( exit,(int));
+extern int EXFUN(  fclose,(FILE*));
+extern void EXFUN( free,(PTR));
+extern int EXFUN(  fseek,(FILE*, long, int));
+extern int EXFUN(  getgid,());
+extern int EXFUN(  getuid,());
+extern PTR EXFUN(  malloc,(unsigned));
+extern void EXFUN( perror,(CONST char *));
+extern int EXFUN(  qsort,(void *data,int els, int siz, int func()));
+extern PTR EXFUN(  realloc, (PTR, unsigned));
 
 extern char *getenv();
 extern int chmod();

diff --git a/bfd/hosts/apollov68.h b/bfd/hosts/apollov68.h
index 4bbc4e1..93a8107 100644 (file)
--- a/bfd/hosts/apollov68.h
+++ b/bfd/hosts/apollov68.h
@@ -45,9 +45,9 @@
  */
 
 #ifndef DONTDECLARE_MALLOC
-extern PROTO(PTR,malloc,(unsigned));
-extern PROTO(PTR ,realloc, (PTR, unsigned));
-extern PROTO(void, free,(PTR));
+extern PTR EXFUN(malloc,(unsigned));
+extern PTR  EXFUN(realloc, (PTR, unsigned));
+extern void EXFUN( free,(PTR));
 #endif
 
 /* EXACT TYPES */

diff --git a/bfd/hosts/delta88.h b/bfd/hosts/delta88.h
index beb33ec..1d7d001 100644 (file)
--- a/bfd/hosts/delta88.h
+++ b/bfd/hosts/delta88.h
@@ -11,36 +11,36 @@
 #include <stdio.h>
 
 #ifndef DONTDECLARE_MALLOC
-extern PROTO(PTR,malloc,(unsigned));
-extern PROTO(PTR ,realloc, (PTR, unsigned));
+extern PTR EXFUN(malloc,(unsigned));
+extern PTR  EXFUN(realloc, (PTR, unsigned));
 #endif
-extern PROTO(int, abort,(void));
-extern PROTO(int, free,(PTR));
-extern PROTO(void, bcopy,(char*,char*,int));
-extern PROTO(void, exit,(int));
+extern int EXFUN( abort,(void));
+extern int EXFUN( free,(PTR));
+extern void EXFUN( bcopy,(char*,char*,int));
+extern void EXFUN( exit,(int));
 extern int strtol();
-extern PROTO(void, bzero,(char *, int));
+extern void EXFUN( bzero,(char *, int));
 #define NO_STDARG 1
 
 
 
-extern PROTO(int, abort,(void));
-extern PROTO(int, close,(int));
-extern PROTO(int, fcntl,(int des, int cmd, int e));
+extern int EXFUN( abort,(void));
+extern int EXFUN( close,(int));
+extern int EXFUN( fcntl,(int des, int cmd, int e));
 
 
-extern PROTO(int, qsort,(void *data,int els, int siz, int func()));
-extern PROTO(unsigned short,getuid,(void));
-extern PROTO(unsigned short,getgid,(void));
-extern PROTO(int, fseek,(FILE*, int, int));
-extern PROTO(int, fclose,(FILE*));
-extern PROTO(void, bcopy,(char*,char*,int));
-extern PROTO(int, bcmp,(char *, char *, int));
-extern PROTO(void, bzero,(char *, int));
+extern int EXFUN( qsort,(void *data,int els, int siz, int func()));
+extern unsigned short EXFUN(getuid,(void));
+extern unsigned short EXFUN(getgid,(void));
+extern int EXFUN( fseek,(FILE*, int, int));
+extern int EXFUN( fclose,(FILE*));
+extern void EXFUN( bcopy,(char*,char*,int));
+extern int EXFUN( bcmp,(char *, char *, int));
+extern void EXFUN( bzero,(char *, int));
 extern char * strchr();
-extern PROTO(void, perror,(CONST char *));
+extern void EXFUN( perror,(CONST char *));
 extern char *getenv();
-extern PROTO(PTR, memchr,(const void *, int, unsigned ));
+extern PTR EXFUN( memchr,(const void *, int, unsigned ));
 extern char *strrchr();
 extern int chmod();
 extern int fread();

diff --git a/bfd/hosts/dgux.h b/bfd/hosts/dgux.h
index 09aea10..f5bd533 100644 (file)
--- a/bfd/hosts/dgux.h
+++ b/bfd/hosts/dgux.h
@@ -12,15 +12,15 @@
 #include <stdio.h>
 
 #ifndef DONTDECLARE_MALLOC
-extern PROTO(PTR,malloc,(unsigned));
-extern PROTO(PTR ,realloc, (PTR, unsigned));
+extern PTR EXFUN(malloc,(unsigned));
+extern PTR  EXFUN(realloc, (PTR, unsigned));
 #endif
-extern PROTO(int, abort,(void));
-extern PROTO(int, free,(PTR));
-extern PROTO(void, bcopy,(char*,char*,int));
-extern PROTO(void, exit,(int));
+extern int EXFUN( abort,(void));
+extern int EXFUN( free,(PTR));
+extern void EXFUN( bcopy,(char*,char*,int));
+extern void EXFUN( exit,(int));
 extern int strtol();
-extern PROTO(void, bzero,(char *, int));
+extern void EXFUN( bzero,(char *, int));
 #define NO_STDARG 1
 
 

diff --git a/bfd/hosts/harris.h b/bfd/hosts/harris.h
index e09ed42..33123b2 100644 (file)
--- a/bfd/hosts/harris.h
+++ b/bfd/hosts/harris.h
@@ -11,15 +11,15 @@
 #include <stdio.h>
 
 #ifndef DONTDECLARE_MALLOC
-extern PROTO(PTR,malloc,(unsigned));
-extern PROTO(PTR ,realloc, (PTR, unsigned));
+extern PTR EXFUN(malloc,(unsigned));
+extern PTR  EXFUN(realloc, (PTR, unsigned));
 #endif
-extern PROTO(int, abort,(void));
-extern PROTO(int, free,(PTR));
-extern PROTO(void, bcopy,(char*,char*,int));
-extern PROTO(void, exit,(int));
+extern int EXFUN( abort,(void));
+extern int EXFUN( free,(PTR));
+extern void EXFUN( bcopy,(char*,char*,int));
+extern void EXFUN( exit,(int));
 extern int strtol();
-extern PROTO(void, bzero,(char *, int));
+extern void EXFUN( bzero,(char *, int));
 
 /* EXACT TYPES */
 typedef char int8e_type;

diff --git a/bfd/hosts/i386mach.h b/bfd/hosts/i386mach.h
index 03b06da..3989675 100644 (file)
--- a/bfd/hosts/i386mach.h
+++ b/bfd/hosts/i386mach.h
@@ -16,9 +16,9 @@ extern int errno;             /* <errno.h> forgets to do this... */
 #define SEEK_SET 0
 #define SEEK_CUR 1
 
-extern PROTO(PTR, malloc, (unsigned));
-extern PROTO(PTR, realloc, (PTR, unsigned));
-extern PROTO(void, free, (PTR));
+extern PTR EXFUN( malloc, (unsigned));
+extern PTR EXFUN( realloc, (PTR, unsigned));
+extern void EXFUN( free, (PTR));
 
 #define        HAVE_STRERROR
 

diff --git a/bfd/hosts/i386v.h b/bfd/hosts/i386v.h
index f2cf6ef..f2a5c7d 100644 (file)
--- a/bfd/hosts/i386v.h
+++ b/bfd/hosts/i386v.h
@@ -44,9 +44,9 @@
  */
 
 #ifndef DONTDECLARE_MALLOC
-extern PROTO(PTR,malloc,(unsigned));
-extern PROTO(PTR ,realloc, (PTR, unsigned));
-extern PROTO(void, free,(PTR));
+extern PTR EXFUN(malloc,(unsigned));
+extern PTR  EXFUN(realloc, (PTR, unsigned));
+extern void EXFUN( free,(PTR));
 #endif
 
 /* EXACT TYPES */

diff --git a/bfd/hosts/i386v4.h b/bfd/hosts/i386v4.h
index b253b18..9e91c27 100644 (file)
--- a/bfd/hosts/i386v4.h
+++ b/bfd/hosts/i386v4.h
@@ -19,18 +19,18 @@
 #define POSIX_UTIME
 #define HAVE_PROCFS    /* This host has /proc support */
 
-extern PROTO(void, abort,(void));
-extern PROTO(int,  close,(int));
-extern PROTO(void, exit,(int));
-extern PROTO(int,  fclose,(FILE*));
-extern PROTO(void, free,(PTR));
-extern PROTO(int,  fseek,(FILE*, long, int));
-extern PROTO(int,  getgid,());
-extern PROTO(int,  getuid,());
-extern PROTO(PTR,  malloc,(unsigned));
-extern PROTO(void, perror,(CONST char *));
-extern PROTO(int,  qsort,(void *data,int els, int siz, int func()));
-extern PROTO(PTR,  realloc, (PTR, unsigned));
+extern void EXFUN( abort,(void));
+extern int EXFUN(  close,(int));
+extern void EXFUN( exit,(int));
+extern int EXFUN(  fclose,(FILE*));
+extern void EXFUN( free,(PTR));
+extern int EXFUN(  fseek,(FILE*, long, int));
+extern int EXFUN(  getgid,());
+extern int EXFUN(  getuid,());
+extern PTR EXFUN(  malloc,(unsigned));
+extern void EXFUN( perror,(CONST char *));
+extern int EXFUN(  qsort,(void *data,int els, int siz, int func()));
+extern PTR EXFUN(  realloc, (PTR, unsigned));
 
 extern char *getenv();
 extern int chmod();

diff --git a/bfd/hosts/sparc-ll.h b/bfd/hosts/sparc-ll.h
index 14ca8ad..a3c1837 100644 (file)
--- a/bfd/hosts/sparc-ll.h
+++ b/bfd/hosts/sparc-ll.h
@@ -18,29 +18,29 @@
 /* Make the basic types 64-bit quantities on the host */
 #define        HOST_64_BIT     long long
 
-extern PROTO(int, abort,(void));
-extern PROTO(int, close,(int));
-extern PROTO(int, fcntl,(int des, int cmd, int e));
-extern PROTO(int, fprintf,(FILE *,char *,...));
-extern PROTO(int, printf,(char *,...));
-extern PROTO(int, qsort,(void *data,int els, int siz, int func()));
-extern PROTO(void, exit,(int));
-extern PROTO(int, fseek,(FILE*, int, int));
-extern PROTO(int, fclose,(FILE*));
-extern PROTO(void, bcopy,(char*,char*,int));
-extern PROTO(int, bcmp,(char *, char *, int));
-extern PROTO(void, bzero,(char *, int));
-extern PROTO(PTR,memset,(PTR, int,unsigned int));
+extern int EXFUN( abort,(void));
+extern int EXFUN( close,(int));
+extern int EXFUN( fcntl,(int des, int cmd, int e));
+extern int EXFUN( fprintf,(FILE *,char *,...));
+extern int EXFUN( printf,(char *,...));
+extern int EXFUN( qsort,(void *data,int els, int siz, int func()));
+extern void EXFUN( exit,(int));
+extern int EXFUN( fseek,(FILE*, int, int));
+extern int EXFUN( fclose,(FILE*));
+extern void EXFUN( bcopy,(char*,char*,int));
+extern int EXFUN( bcmp,(char *, char *, int));
+extern void EXFUN( bzero,(char *, int));
+extern PTR EXFUN(memset,(PTR, int,unsigned int));
 #ifndef __GNUC__
-PROTO(PTR, memcpy,(PTR,CONST PTR,unsigned int));
+ PTR EXFUN( memcpy,(PTR,CONST PTR,unsigned int));
 #else
-/* PROTO(char *, memcpy,(char *,CONST char *,unsigned int)); */
+/* char * EXFUN( memcpy,(char *,CONST char *,unsigned int)); */
 #endif
 
-extern PROTO(int,getuid,());
-extern PROTO(int,getgid,());
+extern int EXFUN(getuid,());
+extern int EXFUN(getgid,());
 extern char * strchr();
-extern PROTO(void, perror,(CONST char *));
+extern void EXFUN( perror,(CONST char *));
 extern char *getenv();
 extern char *memchr();
 extern char *strrchr();
@@ -52,11 +52,11 @@ extern int sscanf();
 extern int stat();
 extern int strtol();
 #ifndef DONTDECLARE_MALLOC
-extern PROTO(PTR,malloc,(unsigned));
-extern PROTO(PTR ,realloc, (PTR, unsigned));
+extern PTR EXFUN(malloc,(unsigned));
+extern PTR  EXFUN(realloc, (PTR, unsigned));
 #endif
 
-extern PROTO(int, free,(PTR));
+extern int EXFUN( free,(PTR));
 
 
 extern char *strrchr();

diff --git a/bfd/hosts/sparc.h b/bfd/hosts/sparc.h
index dcd81c7..7c8c3c6 100644 (file)
--- a/bfd/hosts/sparc.h
+++ b/bfd/hosts/sparc.h
@@ -31,7 +31,7 @@ extern void EXFUN(bzero,(char *, int));
 #ifndef __GNUC__
 PTR EXFUN(memcpy,(PTR,CONST PTR,unsigned int));
 #else
-/* PROTO(char *, memcpy,(char *,CONST char *,unsigned int)); */
+/* char * EXFUN( memcpy,(char *,CONST char *,unsigned int)); */
 #endif
 
 PTR EXFUN(memset,(PTR, int, int));

diff --git a/bfd/hosts/stratus.h b/bfd/hosts/stratus.h
index 5ecbcad..08d5c7c 100644 (file)
--- a/bfd/hosts/stratus.h
+++ b/bfd/hosts/stratus.h
@@ -19,18 +19,18 @@
 #define POSIX_UTIME
 #define HAVE_PROCFS    /* This host has /proc support */
 
-extern PROTO(void, abort,(void));
-extern PROTO(int,  close,(int));
-extern PROTO(void, exit,(int));
-extern PROTO(int,  fclose,(FILE*));
-extern PROTO(void, free,(PTR));
-extern PROTO(int,  fseek,(FILE*, long, int));
-extern PROTO(int,  getgid,());
-extern PROTO(int,  getuid,());
-extern PROTO(PTR,  malloc,(unsigned));
-extern PROTO(void, perror,(CONST char *));
-extern PROTO(int,  qsort,(void *data,int els, int siz, int func()));
-extern PROTO(PTR,  realloc, (PTR, unsigned));
+extern void EXFUN( abort,(void));
+extern int EXFUN(  close,(int));
+extern void EXFUN( exit,(int));
+extern int EXFUN(  fclose,(FILE*));
+extern void EXFUN( free,(PTR));
+extern int EXFUN(  fseek,(FILE*, long, int));
+extern int EXFUN(  getgid,());
+extern int EXFUN(  getuid,());
+extern PTR EXFUN(  malloc,(unsigned));
+extern void EXFUN( perror,(CONST char *));
+extern int EXFUN(  qsort,(void *data,int els, int siz, int func()));
+extern PTR EXFUN(  realloc, (PTR, unsigned));
 
 extern char *getenv();
 extern int chmod();

diff --git a/bfd/hosts/sun3.h b/bfd/hosts/sun3.h
index 3036ff1..544cf9e 100644 (file)
--- a/bfd/hosts/sun3.h
+++ b/bfd/hosts/sun3.h
@@ -12,20 +12,20 @@
 #define SEEK_SET 0
 #define SEEK_CUR 1
 
-extern PROTO(int, abort,(void));
-extern PROTO(int, close,(int));
-extern PROTO(int, fcntl,(int des, int cmd, int e));
-extern PROTO(int, fprintf,(FILE *,char *,...));
-extern PROTO(int, printf,(char *,...));
-extern PROTO(int, qsort,(void *data,int els, int siz, int func()));
-extern PROTO(int, exit,(int));
-extern PROTO(int, fseek,(FILE*, int, int));
-extern PROTO(int, fclose,(FILE*));
-extern PROTO(void, bcopy,(char*,char*,int));
-extern PROTO(int, bcmp,(char *, char *, int));
-extern PROTO(void, bzero,(char *, int));
+extern int EXFUN( abort,(void));
+extern int EXFUN( close,(int));
+extern int EXFUN( fcntl,(int des, int cmd, int e));
+extern int EXFUN( fprintf,(FILE *,char *,...));
+extern int EXFUN( printf,(char *,...));
+extern int EXFUN( qsort,(void *data,int els, int siz, int func()));
+extern int EXFUN( exit,(int));
+extern int EXFUN( fseek,(FILE*, int, int));
+extern int EXFUN( fclose,(FILE*));
+extern void EXFUN( bcopy,(char*,char*,int));
+extern int EXFUN( bcmp,(char *, char *, int));
+extern void EXFUN( bzero,(char *, int));
 extern char * strchr();
-extern PROTO(void, perror,(CONST char *));
+extern void EXFUN( perror,(CONST char *));
 extern char *getenv();
 extern char *memchr();
 extern char *strrchr();