Module Name: src
Committed By: alnsn
Date: Fri Nov 9 23:09:32 UTC 2012
Modified Files:
src/sys/external/bsd/sljit/dist/sljit_src: sljitConfig.h
sljitConfigInternal.h
Log Message:
Apply adapted patch from joerg@ to fix clang build.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h
diff -u src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h:1.5 src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h:1.6
--- src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h:1.5 Sun Oct 28 09:38:59 2012
+++ src/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h Fri Nov 9 23:09:31 2012
@@ -74,11 +74,16 @@
#endif
#ifdef _KERNEL
+
#ifdef DIAGNOSTIC
#define SLJIT_DEBUG 1
#else
#define SLJIT_DEBUG 0
#endif
+
+#define SLJIT_ASSERT(x) KASSERT(x)
+#define SLJIT_ASSERT_STOP() \
+ panic("Should never been reached " __FILE__ ":%d\n", __LINE__)
#endif
#ifdef _KERNEL
Index: src/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h
diff -u src/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h:1.4 src/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h:1.5
--- src/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h:1.4 Sun Oct 28 09:38:59 2012
+++ src/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h Fri Nov 9 23:09:32 2012
@@ -415,16 +415,12 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_free
/* Feel free to redefine these two macros. */
#ifndef SLJIT_ASSERT
-#define SLJIT_HALT_PROCESS() \
- *((int*)0) = 0
+#include <assert.h>
+#include <stdlib.h>
-#define SLJIT_ASSERT(x) \
- do { \
- if (SLJIT_UNLIKELY(!(x))) { \
- printf("Assertion failed at " __FILE__ ":%d\n", __LINE__); \
- SLJIT_HALT_PROCESS(); \
- } \
- } while (0)
+#define SLJIT_HALT_PROCESS() abort()
+
+#define SLJIT_ASSERT(x) assert(x)
#endif /* !SLJIT_ASSERT */
