Changeset 1099

Timestamp:

Jan 29, 2004, 5:18:35 AM (22 years ago)

Author:

bird

Message:

Changed error to error as GLIBC does.

Location:

trunk/src/emx/src/lib

Files:

• lgpl/misc/error.c (modified) (5 diffs, 1 prop)
• libc.def (modified) (1 diff, 1 prop)

trunk/src/emx/src/lib/lgpl/misc/error.c

@@ -26 +26 @@
 
 #include <stdio.h>
+#ifndef __EMX__                         /* bird */
 #include <libintl.h>
+#endif                                  /* bird */
 #ifdef _LIBC
 # include <wchar.h>
@@ -72 +74 @@
 #ifdef _LIBC
 /* In the GNU C library, there is a predefined variable for this.  */
-
 # define program_name program_invocation_name
 # include <errno.h>
@@ -84 +85 @@
                              unsigned int line_number, const char *message,
                              ...)
-     __attribute__ ((__format__ (__printf__, 5, 6)));;
+     __attribute__ ((__format__ (__printf__, 5, 6)));
 # define error __error
 # define error_at_line __error_at_line
@@ -102 +103 @@
 # endif
 
-#ifndef __EMX__
+#ifndef __EMX__                         /* bird */
 /* The calling program should define program_name and set it to the
    name of the executing program.  */
 extern char *program_name;
-#else
+#else                                   /* bird */
 /* Use the BSD _getprogname() which the Innotek LIBC also implements.
    Using this save the time used to maintain the two program_* vars
@@ -112 +113 @@
 extern const char *_getprogname(void);
 #define program_name    _getprogname()
-#endif
+
+/* In GNU libc we want do not want to use the common name `error' directly.
+   Instead make it a weak alias.  */
+extern void __error (int status, int errnum, const char *message, ...)
+     __attribute__ ((__format__ (__printf__, 3, 4)));
+extern void __error_at_line (int status, int errnum, const char *file_name,
+                             unsigned int line_number, const char *message,
+                             ...)
+     __attribute__ ((__format__ (__printf__, 5, 6)));
+# define error __error
+# define error_at_line __error_at_line
+
+#endif                                  /* bird */
 
 # if HAVE_STRERROR_R || defined strerror_r

trunk/src/emx/src/lib/libc.def

@@ -991 +991 @@
     "___spawni" @1018
     "_strsignal" @1019
-    "_error" @1020
-    "_error_at_line" @1021
+    "___error" @1020
+    "___error_at_line" @1021
     "_sys_nsig" @1022
     "_sys_siglist" @1023