* Made ASSERT definition conditional to avoid clashes.

* Automatic whitespace cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29408 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/userlandfs/shared/OpenHashTable.h

@@ -49,7 +49,9 @@ All rights reserved.
 #include <new.h>
 
 // don't include <Debug.h>
-#define ASSERT(E)               (void)0
+#ifndef ASSERT
+#	define ASSERT(E)               (void)0
+#endif
 #define TRESPASS()              (void)0
 
 //namespace BPrivate {

src/add-ons/kernel/file_systems/ramfs/OpenHashTable.h

@@ -52,7 +52,9 @@ All rights reserved.
 #include "Misc.h"
 
 // don't include <Debug.h>
-#define ASSERT(E)               (void)0
+#ifndef ASSERT
+#	define ASSERT(E)               (void)0
+#endif
 #define TRESPASS()              (void)0
 
 //namespace BPrivate {

src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/OpenHashTable.h

@@ -52,7 +52,9 @@ All rights reserved.
 #include "Misc.h"
 
 // don't include <Debug.h>
-#define ASSERT(E)               (void)0
+#ifndef ASSERT
+#	define ASSERT(E)               (void)0
+#endif
 #define TRESPASS()              (void)0
 
 //namespace BPrivate {