2 files changed, 3 insertions, 5 deletions
diff --git a/zap/include/zap/bs.h b/zap/include/zap/bs.h
index 7e14502..6c2815d 100644
--- a/zap/include/zap/bs.h
+++ b/zap/include/zap/bs.h
@@ -24,7 +24,7 @@ typedef signed char zap_cmp;
 #define zap_gt ((zap_cmp)+0x7F)
 #define zap_lt ((zap_cmp)-0x80)
 
-#define zap_nopos (~((zap_sz)+0u))
+#define zap_nopos ((zap_sz)+0xFFFFFFFFFFFFFFFFu)
 
 #define zap_nullptr (0x0u)
 
diff --git a/zap/include/zap/mem.h b/zap/include/zap/mem.h
index 8bcaa0b..d32a910 100644
--- a/zap/include/zap/mem.h
+++ b/zap/include/zap/mem.h
@@ -13,15 +13,13 @@
 extern "C" {
 #endif
 
-__attribute__ ((hot,nothrow)) void zap_memcat( void const * lptr, zap_sz llen,void const * rptr, zap_sz rlen, void * buf);
 __attribute__ ((hot,warn_unused_result)) zap_sz zap_memcnt( void const * ptr, zap_sz sz, zap_sz num, zap_bool (* fn)(void const *));
-__attribute__ ((hot,nothrow)) void zap_memcp( void const * in, zap_sz num, void * out);
+__attribute__ ((hot,nothrow)) zap_sz 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,nothrow)) zap_sz zap_memfill( void * ptr, zap_sz num, unsigned char val);
 __attribute__ ((hot,nothrow,warn_unused_result)) zap_sz zap_memfnd( void const * ptr, zap_sz num, unsigned char byte);
 __attribute__ ((hot)) void zap_memfor( void * ptr, zap_sz sz, zap_sz num, void (* fn)(void *));
 __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)) 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);