2 files changed, 2 insertions, 8 deletions
diff --git a/zap/include/zap/bs.h b/zap/include/zap/bs.h
index c2a7053..4d8d004 100644
--- a/zap/include/zap/bs.h
+++ b/zap/include/zap/bs.h
@@ -26,15 +26,11 @@ typedef signed char zap_cmp;
 
 #define zap_nopos (~((zap_sz)+0u))
 
-#if defined(__cplusplus)
-#define zap_nullptr ((unsigned long)0x0u)
-#else
-#define zap_nullptr ((void *)0x0u)
-#endif
+#define zap_nullptr ((zap_sz)0x0u)
 
 typedef unsigned long zap_sz;
 
-#define zap_ver ((unsigned long)+0x10u)
+#define zap_ver ((unsigned long)+0x11u)
 
 #if defined(__cplusplus)
 }
diff --git a/zap/include/zap/mem.h b/zap/include/zap/mem.h
index 46ab872..f4877fa 100644
--- a/zap/include/zap/mem.h
+++ b/zap/include/zap/mem.h
@@ -17,13 +17,11 @@ __attribute__ ((hot,nothrow,warn_unused_result)) zap_sz zap_fndbyte( void co
 __attribute__ ((hot,nothrow,warn_unused_result)) zap_sz zap_fndchr( char const * str, char chr);
 __attribute__ ((hot)) void zap_foreach( void * ptr, zap_sz sz, zap_sz num, void (* fn)(void *));
 __attribute__ ((hot,nothrow)) void zap_memcat( void const * lptr, zap_sz llen,void const * rptr, zap_sz rlen, void * buf);
-__attribute__ ((hot,nothrow,warn_unused_result)) zap_cmp zap_memcmp( void const * lstr, zap_sz num, void const * rstr);
 __attribute__ ((hot,nothrow)) void zap_memcp( void const * in, zap_sz num, void * out);
 __attribute__ ((hot,nothrow,warn_unused_result)) zap_bool zap_memeq( void const * lptr, zap_sz num, void const * rptr);
 __attribute__ ((hot,nothrow)) void zap_memfill( void * ptr, zap_sz num, unsigned char val);
 __attribute__ ((hot)) void zap_memgen( void * ptr, zap_sz sz, zap_sz num, void (* fn)(zap_sz,void *));
 __attribute__ ((hot,nothrow)) void zap_strcat( char const * lstr, char const * rstr,char * buf);
-__attribute__ ((hot,nothrow,warn_unused_result)) zap_cmp zap_strcmp( char const * lstr, char const * rstr);
 __attribute__ ((hot,nothrow)) zap_sz zap_strcp( char const * in, char * out);
 __attribute__ ((hot,nothrow,warn_unused_result)) zap_bool zap_streq( char const * lstr, char const * rstr);
 __attribute__ ((hot,nothrow)) zap_sz zap_strfill( char * lstr, char chr);