Fix build on -current (#include <wchar.h> instead of <rune.h>)

This commit is contained in:
Kris Kennaway 2002-10-26 05:12:21 +00:00
parent 2c2c21bd9d
commit 0cb3e9266a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=68860
2 changed files with 24 additions and 10 deletions

View file

@ -1,10 +1,17 @@
--- libgale/wcwidth.c.orig Fri Oct 12 13:45:37 2001 --- /tmp/wcwidth.c.orig Fri Oct 25 21:05:46 2002
+++ libgale/wcwidth.c Fri Oct 12 13:45:52 2001 +++ libgale/wcwidth.c Fri Oct 25 21:05:51 2002
@@ -8,8 +8,9 @@ @@ -6,10 +6,16 @@
* Markus Kuhn -- 2000-02-08 -- public domain
*/
#ifdef __FreeBSD__ /* peterh@sapros.com */ -#ifdef __FreeBSD__ /* peterh@sapros.com */
+#ifdef __FreeBSD__
+#include <osreldate.h>
+#if __FreeBSD_version >= 500000
+#include <wchar.h>
+#else
#include <rune.h> #include <rune.h>
-#endif #endif
+#else +#else
#include <wchar.h> #include <wchar.h>
+#endif +#endif

View file

@ -1,10 +1,17 @@
--- libgale/wcwidth.c.orig Fri Oct 12 13:45:37 2001 --- /tmp/wcwidth.c.orig Fri Oct 25 21:05:46 2002
+++ libgale/wcwidth.c Fri Oct 12 13:45:52 2001 +++ libgale/wcwidth.c Fri Oct 25 21:05:51 2002
@@ -8,8 +8,9 @@ @@ -6,10 +6,16 @@
* Markus Kuhn -- 2000-02-08 -- public domain
*/
#ifdef __FreeBSD__ /* peterh@sapros.com */ -#ifdef __FreeBSD__ /* peterh@sapros.com */
+#ifdef __FreeBSD__
+#include <osreldate.h>
+#if __FreeBSD_version >= 500000
+#include <wchar.h>
+#else
#include <rune.h> #include <rune.h>
-#endif #endif
+#else +#else
#include <wchar.h> #include <wchar.h>
+#endif +#endif