[libu] array nuts

koanlogic · Aug 30, 2008 · 3436908 · 3436908
1 parent b413423
commit 3436908
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,10 +1,10 @@
-$Id: ChangeLog,v 1.50 2008/08/13 11:07:11 tat Exp $
+$Id: ChangeLog,v 1.51 2008/08/30 06:53:52 tho Exp $
 
 ChangeLog file of LibU - http://www.koanlogic.com/libu/index.html
 
 LibU x.y.z:
-    - [config] u_config_sort_children added
-    - [config] u_config_del_child added
+	- [config] u_config_sort_children added
+	- [config] u_config_del_child added
 	- [log] u_log_set_{lock,unlock} added to setup locking callbacks (needed on 
 	  multi-threading environments)
 	- [configure] added --no_docs and --do_test configure flags

diff --git a/srcs/toolbox/array.c b/srcs/toolbox/array.c
@@ -133,7 +133,7 @@ int u_array_resize (u_array_t *da, size_t idx)
  */
 
 #define U_ARRAY_GETSET_F(pfx, dtype, ctype)    \
-int u_array_set_##pfx (u_array_t *da, size_t idx, ctype v, ctype *pold)     \
+int u_array_set##pfx (u_array_t *da, size_t idx, ctype v, ctype *pold)      \
 {                                                                           \
     ctype *ep;                                                              \
                                                                             \
@@ -162,7 +162,7 @@ err:                                                                        \
     return -1;                                                              \
 }                                                                           \
                                                                             \
-int u_array_get_##pfx (u_array_t *da, size_t idx, ctype *pv)                \
+int u_array_get##pfx (u_array_t *da, size_t idx, ctype *pv)                 \
 {                                                                           \
     ctype *ep;                                                              \
                                                                             \
@@ -183,28 +183,28 @@ err:                                                                        \
     return -1;                                                              \
 }
 
-U_ARRAY_GETSET_F(char, U_ARRAY_TYPE_CHAR, char)
-U_ARRAY_GETSET_F(uchar, U_ARRAY_TYPE_UCHAR, unsigned char)
-U_ARRAY_GETSET_F(short, U_ARRAY_TYPE_SHORT, short)
-U_ARRAY_GETSET_F(ushort, U_ARRAY_TYPE_USHORT, unsigned short)
-U_ARRAY_GETSET_F(int, U_ARRAY_TYPE_INT, int)
-U_ARRAY_GETSET_F(uint, U_ARRAY_TYPE_UINT, unsigned int)
-U_ARRAY_GETSET_F(long, U_ARRAY_TYPE_LONG, long)
-U_ARRAY_GETSET_F(ulong, U_ARRAY_TYPE_ULONG, unsigned long)
-U_ARRAY_GETSET_F(float, U_ARRAY_TYPE_FLOAT, float)
-U_ARRAY_GETSET_F(double, U_ARRAY_TYPE_DOUBLE, double)
-U_ARRAY_GETSET_F(custom, U_ARRAY_TYPE_CUSTOM, void *)
+U_ARRAY_GETSET_F(_char, U_ARRAY_TYPE_CHAR, char)
+U_ARRAY_GETSET_F(_uchar, U_ARRAY_TYPE_UCHAR, unsigned char)
+U_ARRAY_GETSET_F(_short, U_ARRAY_TYPE_SHORT, short)
+U_ARRAY_GETSET_F(_ushort, U_ARRAY_TYPE_USHORT, unsigned short)
+U_ARRAY_GETSET_F(_int, U_ARRAY_TYPE_INT, int)
+U_ARRAY_GETSET_F(_uint, U_ARRAY_TYPE_UINT, unsigned int)
+U_ARRAY_GETSET_F(_long, U_ARRAY_TYPE_LONG, long)
+U_ARRAY_GETSET_F(_ulong, U_ARRAY_TYPE_ULONG, unsigned long)
+U_ARRAY_GETSET_F(_float, U_ARRAY_TYPE_FLOAT, float)
+U_ARRAY_GETSET_F(_double, U_ARRAY_TYPE_DOUBLE, double)
+U_ARRAY_GETSET_F(_custom, U_ARRAY_TYPE_CUSTOM, void *)
 
 #ifdef HAVE_BOOL
-U_ARRAY_GETSET_F(bool, U_ARRAY_TYPE_BOOL, bool)
+U_ARRAY_GETSET_F(_bool, U_ARRAY_TYPE_BOOL, bool)
 #endif  /* HAVE_BOOL */
 
 #ifdef HAVE_LONG_LONG
-U_ARRAY_GETSET_F(longlong, U_ARRAY_TYPE_LONGLONG, long long)
-U_ARRAY_GETSET_F(ulonglong, U_ARRAY_TYPE_ULONGLONG, unsigned long long)
+U_ARRAY_GETSET_F(_longlong, U_ARRAY_TYPE_LONGLONG, long long)
+U_ARRAY_GETSET_F(_ulonglong, U_ARRAY_TYPE_ULONGLONG, unsigned long long)
 #endif  /* HAVE_LONG_LONG */
 
 #ifdef HAVE_LONG_DOUBLE
-U_ARRAY_GETSET_F(longdouble, U_ARRAY_TYPE_LONGDOUBLE, long double)
+U_ARRAY_GETSET_F(_longdouble, U_ARRAY_TYPE_LONGDOUBLE, long double)
 #endif  /* HAVE_LONG_DOUBLE */