* sparc-dis.c (print_insn_sparc): Update getword prototype.

[deliverable/binutils-gdb.git] / bfd / sysdep.h

diff --git a/bfd/sysdep.h b/bfd/sysdep.h
index 0a58983fa2d5b918704d156de32edb727b8c6e83..195447056a326f3e12ac6cfb23d08fa4cfb5dcc0 100644 (file)
--- a/bfd/sysdep.h
+++ b/bfd/sysdep.h
@@ -1,5 +1,6 @@
 /* sysdep.h -- handle host dependencies for the BFD library
 /* sysdep.h -- handle host dependencies for the BFD library

-   Copyright 1995, 96, 97, 98, 1999 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.

    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.


@@ -102,6 +103,8 @@ extern char *strrchr ();
 #define SEEK_CUR 1
 #endif
 
 #define SEEK_CUR 1
 #endif
 

+#include "filenames.h"
+

 #ifdef NEED_DECLARATION_STRSTR
 extern char *strstr ();
 #endif
 #ifdef NEED_DECLARATION_STRSTR
 extern char *strstr ();
 #endif


@@ -122,8 +125,26 @@ extern void free ();
 extern char *getenv ();
 #endif
 
 extern char *getenv ();
 #endif
 

+/* Define offsetof for those systems which lack it */
+
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
+

 #ifdef ENABLE_NLS
 #include <libintl.h>
 #ifdef ENABLE_NLS
 #include <libintl.h>

+/* Note the use of dgetext() and PACKAGE here, rather than gettext().
+
+   This is because the code in this directory is used to build a library which
+   will be linked with code in other directories to form programs.  We want to
+   maintain a seperate translation file for this directory however, rather
+   than being forced to merge it with that of any program linked to libbfd.
+   This is a library, so it cannot depend on the catalog currently loaded.
+
+   In order to do this, we have to make sure that when we extract messages we
+   use the OPCODES domain rather than the domain of the program that included
+   the bfd library, (eg OBJDUMP).  Hence we use dgettext (PACKAGE, String)
+   and define PACKAGE to be 'bfd'.  (See the code in configure).  */

 #define _(String) dgettext (PACKAGE, String)
 #ifdef gettext_noop
 #define N_(String) gettext_noop (String)
 #define _(String) dgettext (PACKAGE, String)
 #ifdef gettext_noop
 #define N_(String) gettext_noop (String)


@@ -131,14 +152,13 @@ extern char *getenv ();
 #define N_(String) (String)
 #endif
 #else
 #define N_(String) (String)
 #endif
 #else

-/* Stubs that do something close enough.  */
-#define textdomain(String) (String)
-#define gettext(String) (String)
-#define dgettext(Domain,Message) (Message)
-#define dcgettext(Domain,Message,Type) (Message)
-#define bindtextdomain(Domain,Directory) (Domain)
-#define _(String) (String)
-#define N_(String) (String)
+# define gettext(Msgid) (Msgid)
+# define dgettext(Domainname, Msgid) (Msgid)
+# define dcgettext(Domainname, Msgid, Category) (Msgid)
+# define textdomain(Domainname) while (0) /* nothing */
+# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */
+# define _(String) (String)
+# define N_(String) (String)

 #endif
 
 #endif /* ! defined (BFD_SYSDEP_H) */
 #endif
 
 #endif /* ! defined (BFD_SYSDEP_H) */