Imported from util-linux-2.11t tarball.

3 files changed, 3 insertions, 3 deletions

diff --git a/lib/nls.h b/lib/nls.h
index d36a5bc8..f54f94df 100644
--- a/lib/nls.h
+++ b/lib/nls.h
@@ -14,7 +14,7 @@ int main(int argc, char *argv[]);
 # include <locale.h>
 #endif
 
-#ifdef ENABLE_NLS
+#if defined MAY_ENABLE_NLS && !defined DISABLE_NLS
 # include <libintl.h>
 # define _(Text) gettext (Text)
 # ifdef gettext_noop
diff --git a/lib/pathnames.h b/lib/pathnames.h
index 33886a5c..d9e05b32 100644
--- a/lib/pathnames.h
+++ b/lib/pathnames.h
@@ -105,7 +105,7 @@ Libc5 and glibc 2.0-2.1 have /var/spool/mail, but glibc 2.1.1 has /var/mail.
 
 /* no more . in DEFPATH */
 #define	_PATH_DEFPATH	        "/usr/local/bin:/bin:/usr/bin"
-#define	_PATH_DEFPATH_ROOT	SBINDIR ":/bin:" USRSBINDIR ":/usr/bin"
+#define	_PATH_DEFPATH_ROOT	"/usr/local/sbin:/usr/local/bin:" SBINDIR ":/bin:" USRSBINDIR ":/usr/bin"
 #define	_PATH_HUSHLOGIN		".hushlogin"
 #define	_PATH_LASTLOG		LOGDIR "/lastlog"
 
diff --git a/lib/widechar.h b/lib/widechar.h
index 1aa91f3f..61021be3 100644
--- a/lib/widechar.h
+++ b/lib/widechar.h
@@ -14,7 +14,7 @@
 
 #if 1
 /* explicit prototypes, since sometimes <wchar.h> does not give them */
-extern int wcwidth (wint_t c);
+extern int wcwidth (wchar_t c);         /* old: wint_t c */
 extern int wcswidth (const wchar_t *s, size_t n);
 extern size_t wcslen (const wchar_t *s);
 extern wchar_t *wcsdup (const wchar_t *s);