Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/sljit/dist/sljit_src Apply adapted patch fr...



details:   https://anonhg.NetBSD.org/src/rev/65a5341c3021
branches:  trunk
changeset: 782630:65a5341c3021
user:      alnsn <alnsn%NetBSD.org@localhost>
date:      Fri Nov 09 23:09:31 2012 +0000

description:
Apply adapted patch from joerg@ to fix clang build.

diffstat:

 sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h         |   5 ++++
 sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h |  14 ++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (45 lines):

diff -r 7355e2d76cdf -r 65a5341c3021 sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h
--- a/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h       Fri Nov 09 20:13:24 2012 +0000
+++ b/sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h       Fri Nov 09 23:09:31 2012 +0000
@@ -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
diff -r 7355e2d76cdf -r 65a5341c3021 sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h
--- a/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h       Fri Nov 09 20:13:24 2012 +0000
+++ b/sys/external/bsd/sljit/dist/sljit_src/sljitConfigInternal.h       Fri Nov 09 23:09:31 2012 +0000
@@ -415,16 +415,12 @@
 /* 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 */
 



Home | Main Index | Thread Index | Old Index