commit bash-4.2-beta snapshot

include/shmbchar.h

@@ -145,6 +145,8 @@
 #ifndef _SHMBCHAR_H
 #define _SHMBCHAR_H 1
 
+#if defined (HANDLE_MULTIBYTE)
+
 #include <string.h>
 
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -347,4 +349,5 @@ is_basic (char c)
 
 #endif
 
+#endif /* HANDLE_MULTIBYTE */
 #endif /* _SHMBCHAR_H */

include/shmbutil.h

@@ -25,9 +25,9 @@
 
 /* Include config.h for HANDLE_MULTIBYTE */
 #include <config.h>
-#include "shmbchar.h"
 
 #if defined (HANDLE_MULTIBYTE)
+#include "shmbchar.h"
 
 extern size_t xmbsrtowcs __P((wchar_t *, const char **, size_t, mbstate_t *));
 extern size_t xdupmbstowcs __P((wchar_t **, char ***, const char *));