Fixed SAME_TYPE to work with obviously nonzero pointers without warnings

diff --git a/lib/birdlib.h b/lib/birdlib.h
index d7c8f5922903c09e20e5983f6e15d2c7ca11ccb1..5a004d9a21fd13a15a06b9c4af6769414a88e42f 100644 (file)
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -21,8 +21,9 @@
 
 /* Ugly structure offset handling macros */
 
+extern char invalid_nonzero_pointer[0];
 #define SAME_TYPE(a, b)        ({ int _ = ((a) != (b)); !_; })
-#define TYPE_CAST(from, to, what) ( SAME_TYPE(((from) NULL), (what)), ((to) (what)))
+#define TYPE_CAST(from, to, what) ( SAME_TYPE(((from) invalid_nonzero_pointer), (what)), ((to) (what)))
 
 #ifdef offsetof
 #define OFFSETOF offsetof

diff --git a/lib/resource.c b/lib/resource.c
index 8a923792fc04854e0865b7115c5abcb60982ca62..a389403b026edc455ac8d7738fda21171e4efc0f 100644 (file)
--- a/lib/resource.c
+++ b/lib/resource.c
@@ -30,6 +30,8 @@
  * is freed upon shutdown of the module.
  */
 
+char invalid_nonzero_pointer[0];
+
 static void pool_dump(struct dump_request *, resource *);
 static void pool_free(resource *);
 static resource *pool_lookup(resource *, unsigned long);