Introduce program_space::remove_objfile

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

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

-   Copyright (C) 1995-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995-2019 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.


@@ -28,15 +28,12 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

-#include "ansidecl.h"
-

 #ifdef HAVE_STDDEF_H
 #include <stddef.h>
 #endif
 
 #include <stdio.h>
 #include <sys/types.h>
 #ifdef HAVE_STDDEF_H
 #include <stddef.h>
 #endif
 
 #include <stdio.h>
 #include <sys/types.h>

-#include <sys/stat.h>

 
 #include <errno.h>
 #if !(defined(errno) || defined(_MSC_VER) && defined(_INC_ERRNO))
 
 #include <errno.h>
 #if !(defined(errno) || defined(_MSC_VER) && defined(_INC_ERRNO))


@@ -108,6 +105,10 @@ extern char *strrchr ();
 #ifndef O_ACCMODE
 #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
 #endif
 #ifndef O_ACCMODE
 #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
 #endif

+/* Systems that don't already define this, don't need it.  */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif

 
 #ifndef SEEK_SET
 #define SEEK_SET 0
 
 #ifndef SEEK_SET
 #define SEEK_SET 0


@@ -170,6 +171,10 @@ extern int fseeko64 (FILE *stream, off64_t offset, int whence);
 #endif
 #endif
 
 #endif
 #endif
 

+#if !HAVE_DECL_STRNLEN
+size_t strnlen (const char *, size_t);
+#endif
+

 /* Define offsetof for those systems which lack it */
 
 #ifndef offsetof
 /* Define offsetof for those systems which lack it */
 
 #ifndef offsetof


@@ -177,31 +182,43 @@ extern int fseeko64 (FILE *stream, off64_t offset, int whence);
 #endif
 
 #ifdef ENABLE_NLS
 #endif
 
 #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)
-#else
-#define N_(String) (String)
-#endif
+# include <libintl.h>
+/* Note the redefinition of gettext and ngettext here to use PACKAGE.
+
+   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 BFD 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).  */
+# undef gettext
+# define gettext(Msgid) dgettext (PACKAGE, Msgid)
+# undef ngettext
+# define ngettext(Msgid1, Msgid2, n) dngettext (PACKAGE, Msgid1, Msgid2, n)
+# define _(String) gettext (String)
+# ifdef gettext_noop
+#  define N_(String) gettext_noop (String)
+# else
+#  define N_(String) (String)
+# endif

 #else
 # define gettext(Msgid) (Msgid)
 # define dgettext(Domainname, Msgid) (Msgid)
 # define dcgettext(Domainname, Msgid, Category) (Msgid)
 #else
 # 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 ngettext(Msgid1, Msgid2, n) \
+  (n == 1 ? Msgid1 : Msgid2)
+# define dngettext(Domainname, Msgid1, Msgid2, n) \
+  (n == 1 ? Msgid1 : Msgid2)
+# define dcngettext(Domainname, Msgid1, Msgid2, n, Category) \
+  (n == 1 ? Msgid1 : Msgid2)
+# define textdomain(Domainname) do {} while (0)
+# define bindtextdomain(Domainname, Dirname) do {} while (0)

 # define _(String) (String)
 # define N_(String) (String)
 #endif
 # define _(String) (String)
 # define N_(String) (String)
 #endif