diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index 8e8cffcc56..97e0456013 100644
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -344,10 +344,11 @@ protected: \
         { \
             if( m_equals( m_getKey( (*node)->m_value ), key ) ) \
                 return node; \
-            node = (Node**)&(*node)->m_nxt; \
+            /* Tell the compiler to not do any strict-aliasing assumptions with the void cast */ \
+            node = (Node**)(void*)&(*node)->m_nxt; \
         } \
  \
-        return 0; \
+        return NULL; \
     } \
  \
     /* returns NULL if not found */ \