Thu Mar 28 11:53:26 1996 Roland McGrath <roland@whiz-bang.gnu.ai.mit.edu>

	* wctype/cname-lookup.h: Find localeinfo.h in ../locale.
	* wctype/wctype.c: Likewise.
	* wctype/wctrans.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 7dd1a4bd173d14bfcd889aafc1f8fc96866ed06c..c31f24ea4ffbc6d10d0bc2e14f3ec5bae4d30c37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 28 11:53:26 1996  Roland McGrath  <roland@whiz-bang.gnu.ai.mit.edu>
+
+       * wctype/cname-lookup.h: Find localeinfo.h in ../locale.
+       * wctype/wctype.c: Likewise.
+       * wctype/wctrans.c: Likewise.
+
 Thu Mar 28 03:00:43 1996  Roland McGrath  <roland@whiz-bang.gnu.ai.mit.edu>
 
        * locale/nl_langinfo.c (nl_langinfo): Use DATA->values instead of

diff --git a/misc/error.c b/misc/error.c
index b12041c761802a103dc465f9c4490f84bbaae09c..49c772dbb58a8cd93c40af14edd3a8af57add6f6 100644 (file)
--- a/misc/error.c
+++ b/misc/error.c
@@ -172,8 +172,8 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
       static const char *old_file_name;
       static unsigned int old_line_number;
 
-      if (old_line_number == line_number
-         && (file_name == old_file_name || !strcmp (old_file_name, file_name))
+      if (old_line_number == line_number &&
+         (file_name == old_file_name || !strcmp (old_file_name, file_name)))
        /* Simply return and print nothing.  */
        return;
 

diff --git a/wctype/cname-lookup.h b/wctype/cname-lookup.h
index bef38a12d38f48ceac6d51230247bf751baa99b7..b3c1cdbede69e92f7e3ba70dd3d25dc599118bc6 100644 (file)
--- a/wctype/cname-lookup.h
+++ b/wctype/cname-lookup.h
@@ -17,7 +17,7 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "localeinfo.h"
+#include "../locale/localeinfo.h"
 
 /* Some words on the runtime of this functions.  Although there is a
    loop in the function the runtime is asymptotically quasi constant.

diff --git a/wctype/wctrans.c b/wctype/wctrans.c
index afe47a915d967ad1badd378e7ef126753e47a8b4..5c855d0b9bea48f717a79544393dd4a813f2e450 100644 (file)
--- a/wctype/wctrans.c
+++ b/wctype/wctrans.c
@@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA.  */
 #include <ctype.h>
 #include <string.h>
 #include <wctype.h>
-#include "localeinfo.h"
+#include "../locale/localeinfo.h"
 
 wctrans_t
 wctrans (const char *property)

diff --git a/wctype/wctype.c b/wctype/wctype.c
index 36db3b95a47b26c684d8c98fa1a0932bc5f5e768..0f7e478d6446c02511fc379c2a2226505e10e26b 100644 (file)
--- a/wctype/wctype.c
+++ b/wctype/wctype.c
@@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA.  */
 #include <endian.h>
 #include <string.h>
 #include <wctype.h>
-#include "localeinfo.h"
+#include "../locale/localeinfo.h"
 
 wctype_t
 wctype (const char *property)