Changeset 2660 in kBuild

Timestamp:

Sep 10, 2012 9:58:26 PM (12 years ago)

Author:

bird

Message:

sed: three haiku hacks, two for gcc2 and one for broken mbrtowc.

Location:

trunk/src/sed

Files:

• basicdefs.h (modified) (1 diff)
• lib/regex_internal.h (modified) (1 diff)
• sed/sed.c (modified) (1 diff)

trunk/src/sed/basicdefs.h

@@ -60 +60 @@
 # define __bool_true_false_are_defined 1
 #else
-# if HAVE_STDBOOL_H
+# if HAVE_STDBOOL_H || defined(__HAIKU__) /* haiku/gcc2 hack */ 
 #  include <stdbool.h>
 # endif

trunk/src/sed/lib/regex_internal.h

@@ -40 +40 @@
 # include <wctype.h>
 #endif /* HAVE_WCTYPE_H || _LIBC */
-#if defined HAVE_STDBOOL_H || defined _LIBC
+#if defined HAVE_STDBOOL_H || defined _LIBC || defined(__HAIKU__) /* haiku hack */
 # include <stdbool.h>
 #endif /* HAVE_STDBOOL_H || _LIBC */

trunk/src/sed/sed/sed.c

@@ -407 +407 @@
   return return_code;
 }
+
+#ifdef __HAIKU__ /* mbrtowc is busted, just stub it and pray the input won't ever acutally be multibyte... */
+size_t mbrtowc(wchar_t *pwc, const char *pch, size_t n, mbstate_t *ps)
+{
+    if (!n) 
+        return 0;
+    if (pwc)
+        *pwc = *pch;
+    return 1;
+}
+#endif