Changeset 609 for branches/GNU/src/binutils/libiberty/getopt.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/libiberty/getopt.c (modified) (3 diffs, 1 prop)

branches/GNU/src/binutils/libiberty/getopt.c

@@ -84 +84 @@
 /* This is for other GNU distributions with internationalized messages.
    When compiling libc, the _ macro is predefined.  */
-# ifdef HAVE_LIBINTL_H
+# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
 #  include <libintl.h>
 #  define _(msgid)      gettext (msgid)
@@ -337 +337 @@
       else
         {
-          memset (__mempcpy (new_str, __getopt_nonoption_flags,
-                             nonoption_flags_max_len),
+          memset (mempcpy (new_str, __getopt_nonoption_flags,
+                           nonoption_flags_max_len),
                   '\0', top + 1 - nonoption_flags_max_len);
           nonoption_flags_max_len = top + 1;
@@ -448 +448 @@
                 nonoption_flags_max_len = -1;
               else
-                memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+                memset (mempcpy (__getopt_nonoption_flags, orig_str, len),
                         '\0', nonoption_flags_max_len - len);
             }