2007-03-24 Paul Brook <paul@codesourcery.com>

[binutils-gdb.git] / binutils / bucomm.h

diff --git a/binutils/bucomm.h b/binutils/bucomm.h
index 2598d13386b31c272ff638771bae649829242392..d07fde8bc2b8f9890fbfd1f0ca8566349148664e 100644 (file)
--- a/binutils/bucomm.h
+++ b/binutils/bucomm.h
@@ -1,6 +1,6 @@
 /* bucomm.h -- binutils common include file.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2002, 2003 Free Software Foundation, Inc.
+   2001, 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 \f
 #ifndef _BUCOMM_H
 #define _BUCOMM_H
@@ -25,14 +25,10 @@
 #include <stdio.h>
 #include <sys/types.h>
 
+#include "bfdver.h"
 #include "config.h"
-#include "bin-bugs.h"
 
-#ifdef ANSI_PROTOTYPES
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #ifdef USE_BINARY_FOPEN
 #include "fopen-bin.h"
@@ -72,24 +68,40 @@ extern char *strrchr ();
 #endif
 #endif
 
-#ifdef NEED_DECLARATION_STRSTR
+#if !HAVE_DECL_STPCPY
+extern char *stpcpy (char *, const char *);
+#endif
+
+#if !HAVE_DECL_STRSTR
 extern char *strstr ();
 #endif
 
 #ifdef HAVE_SBRK
-#ifdef NEED_DECLARATION_SBRK
+#if !HAVE_DECL_SBRK
 extern char *sbrk ();
 #endif
 #endif
 
-#ifdef NEED_DECLARATION_GETENV
+#if !HAVE_DECL_GETENV
 extern char *getenv ();
 #endif
 
-#ifdef NEED_DECLARATION_ENVIRON
+#if !HAVE_DECL_ENVIRON
 extern char **environ;
 #endif
 
+#if !HAVE_DECL_FPRINTF
+extern int fprintf (FILE *, const char *, ...);
+#endif
+
+#if !HAVE_DECL_SNPRINTF
+extern int snprintf(char *, size_t, const char *, ...);
+#endif
+
+#if !HAVE_DECL_VSNPRINTF
+extern int vsnprintf(char *, size_t, const char *, va_list);
+#endif
+
 #ifndef O_RDONLY
 #define O_RDONLY 0
 #endif
@@ -125,7 +137,17 @@ void *alloca ();
 # endif /* HAVE_ALLOCA_H */
 #endif
 
+
 #ifdef HAVE_LOCALE_H
+# ifndef ENABLE_NLS
+   /* The Solaris version of locale.h always includes libintl.h.  If we have
+      been configured with --disable-nls then ENABLE_NLS will not be defined
+      and the dummy definitions of bindtextdomain (et al) below will conflict
+      with the defintions in libintl.h.  So we define these values to prevent
+      the bogus inclusion of libintl.h.  */
+#  define _LIBINTL_H
+#  define _LIBGETTEXT_H
+# endif
 # include <locale.h>
 #endif
 
@@ -147,68 +169,59 @@ void *alloca ();
 # define N_(String) (String)
 #endif
 
+/* Used by ar.c and objcopy.c.  */
+#define BUFSIZE 8192
+
 /* bucomm.c */
-void bfd_nonfatal
-  PARAMS ((const char *));
 
-void bfd_fatal
-  PARAMS ((const char *)) ATTRIBUTE_NORETURN;
+/* Return the filename in a static buffer.  */
+const char *bfd_get_archive_filename (bfd *);
+
+void bfd_nonfatal (const char *);
+
+void bfd_fatal (const char *) ATTRIBUTE_NORETURN;
+
+void report (const char *, va_list) ATTRIBUTE_PRINTF(1,0);
+
+void fatal (const char *, ...) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN;
 
-void report
-  PARAMS ((const char *, va_list));
+void non_fatal (const char *, ...) ATTRIBUTE_PRINTF_1;
 
-void fatal
-  PARAMS ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN;
+void set_default_bfd_target (void);
 
-void non_fatal
-  PARAMS ((const char *, ...)) ATTRIBUTE_PRINTF_1;
+void list_matching_formats (char **);
 
-void set_default_bfd_target
-  PARAMS ((void));
+void list_supported_targets (const char *, FILE *);
 
-void list_matching_formats
-  PARAMS ((char **));
+void list_supported_architectures (const char *, FILE *);
 
-void list_supported_targets
-  PARAMS ((const char *, FILE *));
+int display_info (void);
 
-void list_supported_architectures
-  PARAMS ((const char *, FILE *));
+void print_arelt_descr (FILE *, bfd *, bfd_boolean);
 
-int display_info
-  PARAMS ((void));
-  
-void print_arelt_descr
-  PARAMS ((FILE *, bfd *, bfd_boolean));
+char *make_tempname (char *);
+char *make_tempdir (char *);
 
-char *make_tempname
-  PARAMS ((char *));
+bfd_vma parse_vma (const char *, const char *);
 
-bfd_vma parse_vma
-  PARAMS ((const char *, const char *));
+off_t get_file_size (const char *);
 
 extern char *program_name;
 
 /* filemode.c */
-void mode_string
-  PARAMS ((unsigned long, char *));
+void mode_string (unsigned long, char *);
 
 /* version.c */
-extern void print_version
-  PARAMS ((const char *));
+extern void print_version (const char *);
 
 /* rename.c */
-extern void set_times
-  PARAMS ((const char *, const struct stat *));
+extern void set_times (const char *, const struct stat *);
 
-extern int smart_rename
-  PARAMS ((const char *, const char *, int));
+extern int smart_rename (const char *, const char *, int);
 
 /* libiberty.  */
-PTR xmalloc
-  PARAMS ((size_t));
+void *xmalloc (size_t);
 
-PTR xrealloc
-  PARAMS ((PTR, size_t));
+void *xrealloc (void *, size_t);
 
 #endif /* _BUCOMM_H */