Fix previous change.

[gnulib.git] / lib / error.c

diff --git a/lib/error.c b/lib/error.c
index f533d9d..e5f1dab 100644 (file)
--- a/lib/error.c
+++ b/lib/error.c
@@ -12,13 +12,13 @@
    GNU General Public License for more details.
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #include <stdio.h>
@@ -44,9 +44,12 @@ void exit ();
 #endif
 
 #ifndef _
-#define _(String) String
+# define _(String) String
 #endif
 
+/* Get prototypes for the functions defined here.  */
+#include <error.h>
+
 /* If NULL, error will flush stdout, then print on stderr the program
    name, a colon and a space.  Otherwise, error will call this
    function without parameters instead.  */
@@ -62,20 +65,20 @@ unsigned int error_message_count;
 #ifdef _LIBC
 /* In the GNU C library, there is a predefined variable for this.  */
 
-#define program_name program_invocation_name
-#include <errno.h>
+# define program_name program_invocation_name
+# include <errno.h>
 
-#else
+#else /* not _LIBC */
 
 /* The calling program should define program_name and set it to the
    name of the executing program.  */
 extern char *program_name;
 
-#if HAVE_STRERROR
-# ifndef strerror              /* On some systems, strerror is a macro */
+# if HAVE_STRERROR
+#  ifndef strerror             /* On some systems, strerror is a macro */
 char *strerror ();
-# endif
-#else
+#  endif
+# else
 static char *
 private_strerror (errnum)
      int errnum;
@@ -87,9 +90,10 @@ private_strerror (errnum)
     return sys_errlist[errnum];
   return _("Unknown system error");
 }
-#define strerror private_strerror
-#endif /* HAVE_STRERROR */
-#endif /* _LIBC */
+#  define strerror private_strerror
+# endif        /* HAVE_STRERROR */
+
+#endif /* not _LIBC */
 
 /* Print the program name and error message MESSAGE, which is a printf-style
    format string with optional args.