2 files changed, 9 insertions, 9 deletions
diff --git a/zap/include/zap/bs.h b/zap/include/zap/bs.h
index 3d31a34..04a3d16 100644
--- a/zap/include/zap/bs.h
+++ b/zap/include/zap/bs.h
@@ -85,14 +85,14 @@ typedef zap_i02 zap_chr02;
 
 typedef zap_i8 zap_bool;
 
+typedef zap_i8 zap_byte;
+
 #if \
 csys_arch_arm \
 || csys_arch_ia32
-typedef zap_i8 zap_byte;
 typedef zap_i02 zap_ptr;
 typedef zap_i02 zap_sz;
 #else
-typedef zap_i8 zap_byte;
 typedef zap_i04 zap_ptr;
 typedef zap_i04 zap_sz;
 #endif
diff --git a/zap/include/zap/mem.h b/zap/include/zap/mem.h
index 4085a20..c1544d0 100644
--- a/zap/include/zap/mem.h
+++ b/zap/include/zap/mem.h
@@ -12,17 +12,17 @@
 zap_priv_cdecl
 
 void zap_cp( void * zap_priv_restr dest,void const * zap_priv_restr src, zap_sz num);
-zap_bool zap_eq( void const * lbuf,void const * rbuf,zap_sz num);
-void zap_fill(void * dest,zap_byte val, zap_sz num);
-void * zap_srch(void const * buf, zap_byte val, zap_sz num);
+zap_bool zap_eq( void const * lbuf,void const * rbuf,zap_sz num);
+void zap_fill(void * dest,zap_byte val, zap_sz num);
+void * zap_srch(void const * buf, zap_byte val, zap_sz num);
 
 zap_sz zap_utf8declen(zap_chr8 const * buf);
 zap_sz zap_utf8enclen(zap_chr02 const * buf);
 
-void zap_utf8dec( zap_chr02 * dest,zap_chr8 const * src);
-void zap_utf8enc( zap_chr8 * dest,zap_chr02 const * src);
-void zap_win1252dec(zap_chr02 * dest,zap_chr8 const * src);
-void zap_win1252enc(zap_chr8 * dest,zap_chr02 const * src);
+void zap_utf8dec( zap_chr02 * zap_priv_restr dest,zap_chr8 const * zap_priv_restr src);
+void zap_utf8enc( zap_chr8 * zap_priv_restr dest,zap_chr02 const * zap_priv_restr src);
+void zap_win1252dec(zap_chr02 * zap_priv_restr dest,zap_chr8 const * zap_priv_restr src);
+void zap_win1252enc(zap_chr8 * zap_priv_restr dest,zap_chr02 const * zap_priv_restr src);
 
 zap_priv_cdeclend