Remove unnecessary includes from xerror.h.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 7402afe14fc9e77d03a2e01e287b962bd247bbc1..675a5a9d0985bd507e1006ced32163d2f1b89b6a 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-30  Bruno Haible  <bruno@clisp.org>
+
+       * lib/xerror.h: Don't include error.h.
+       * lib/xerror.c: Include error.h here.
+
 2006-08-28  Bruno Haible  <bruno@clisp.org>
 
        * modules/c-strstr: Remove file, now in gnulib.

diff --git a/gnulib-local/lib/xerror.c b/gnulib-local/lib/xerror.c
index c8b327211b154b662fed73f774cdf8d8e9bb9463..b1bb66d3ff5cc62f689120b60280ca073e490560 100644 (file)
--- a/gnulib-local/lib/xerror.c
+++ b/gnulib-local/lib/xerror.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "error.h"
 #include "progname.h"
 #include "error-progname.h"
 #include "mbswidth.h"

diff --git a/gnulib-local/lib/xerror.h b/gnulib-local/lib/xerror.h
index 4e539d892e30eaf7e13e1460db493fb0e66880a4..b2382451bc2025ca942f0245340ce853f418a5ff 100644 (file)
--- a/gnulib-local/lib/xerror.h
+++ b/gnulib-local/lib/xerror.h
@@ -19,9 +19,6 @@
 #ifndef _XERROR_H
 #define _XERROR_H
 
-/* Get fallback definition of __attribute__.  */
-#include "error.h"
-
 
 #ifdef __cplusplus
 extern "C" {