---

yaml --- r: 299230 b: refs/heads/master c: 2084c24 h: refs/heads/master v: v3
git-mirror · Apr 14, 2012 · 5f93a7f · 5f93a7f
1 parent 5283cc5
commit 5f93a7f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 668ce0ac707719d866af7e432e518af7b4c575ad
+refs/heads/master: 2084c24a81413b75bc97e4bee56b32ffece70460
diff --git a/trunk/include/linux/stddef.h b/trunk/include/linux/stddef.h
@@ -3,14 +3,10 @@
 
 #include <linux/compiler.h>
 
+#ifdef __KERNEL__
+
 #undef NULL
-#if defined(__cplusplus)
-#define NULL 0
-#else
 #define NULL ((void *)0)
-#endif
-
-#ifdef __KERNEL__
 
 enum {
 	false	= 0,