projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix logic bug introduced on 2007-05-06.
[gnulib.git]
/
lib
/
wcwidth.h
diff --git
a/lib/wcwidth.h
b/lib/wcwidth.h
index
80c0d9c
..
8ed5ff8
100644
(file)
--- a/
lib/wcwidth.h
+++ b/
lib/wcwidth.h
@@
-1,5
+1,5
@@
/* Determine the number of screen columns needed for a character.
/* Determine the number of screen columns needed for a character.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006
, 2007
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-18,26
+18,19
@@
#ifndef _gl_WCWIDTH_H
#define _gl_WCWIDTH_H
#ifndef _gl_WCWIDTH_H
#define _gl_WCWIDTH_H
+#if HAVE_WCHAR_T
+
/* Get wcwidth if available, along with wchar_t. */
/* Get wcwidth if available, along with wchar_t. */
-#if HAVE_WCHAR_H
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
- <wchar.h>.
- BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
- <wchar.h>. */
-# include <stdio.h>
-# include <time.h>
# include <wchar.h>
# include <wchar.h>
-#endif
/* Get iswprint. */
/* Get iswprint. */
-#if HAVE_WCTYPE_H
# include <wctype.h>
# include <wctype.h>
-#endif
-#if !defined iswprint && !HAVE_ISWPRINT
-# define iswprint(wc) 1
-#endif
-#if !defined wcwidth && !HAVE_WCWIDTH
+# ifndef HAVE_DECL_WCWIDTH
+"this configure-time declaration test was not run"
+# endif
+# ifndef wcwidth
+# if !HAVE_WCWIDTH
/* wcwidth doesn't exist, so assume all printable characters have
width 1. */
/* wcwidth doesn't exist, so assume all printable characters have
width 1. */
@@
-47,6
+40,18
@@
wcwidth (wchar_t wc)
return wc == 0 ? 0 : iswprint (wc) ? 1 : -1;
}
return wc == 0 ? 0 : iswprint (wc) ? 1 : -1;
}
-#endif
+# elif !HAVE_DECL_WCWIDTH
+
+/* wcwidth exists but is not declared. */
+extern
+# ifdef __cplusplus
+"C"
+# endif
+int wcwidth (int /* actually wchar_t */);
+
+# endif
+# endif
+
+#endif /* HAVE_WCHAR_T */
#endif /* _gl_WCWIDTH_H */
#endif /* _gl_WCWIDTH_H */