[GNUnet-SVN] r8378 - libmicrohttpd/src/include

[gnunet]

Author: durner
Date: 2009-04-04 15:00:52 -0600 (Sat, 04 Apr 2009)
New Revision: 8378

Modified:
   libmicrohttpd/src/include/plibc.h
Log:
fix Linux

Modified: libmicrohttpd/src/include/plibc.h
===================================================================
--- libmicrohttpd/src/include/plibc.h   2009-04-04 17:40:53 UTC (rev 8377)
+++ libmicrohttpd/src/include/plibc.h   2009-04-04 21:00:52 UTC (rev 8378)
@@ -658,18 +658,15 @@
 
 
 /* For use with hsearch(3).  */
-#ifndef __COMPAR_FN_T
-# define __COMPAR_FN_T
   typedef int (*PLIBC_SEARCH__compar_fn_t) (__const void *, __const void *);
 
   typedef PLIBC_SEARCH__compar_fn_t _win_comparison_fn_t;
-#endif
 
 /* Action which shall be performed in the call the hsearch.  */
   typedef enum
   {
-    FIND,
-    ENTER
+    PLIBC_SEARCH_FIND,
+    PLIBC_SEARCH_ENTER
   }
   PLIBC_SEARCH_ACTION;
 
@@ -732,10 +729,10 @@
 /* For tsearch */
   typedef enum
   {
-    preorder,
-    postorder,
-    endorder,
-    leaf
+    PLIBC_SEARCH_preorder,
+    PLIBC_SEARCH_postorder,
+    PLIBC_SEARCH_endorder,
+    PLIBC_SEARCH_leaf
   }
   PLIBC_SEARCH_VISIT;
 
@@ -754,12 +751,9 @@
                       void **__restrict __rootp,
                       PLIBC_SEARCH__compar_fn_t __compar);
 
-#ifndef __ACTION_FN_T
-# define __ACTION_FN_T
   typedef void (*PLIBC_SEARCH__action_fn_t) (__const void *__nodep,
                                              PLIBC_SEARCH_VISIT __value,
                                              int __level);
-#endif
 
 /* Walk through the whole tree and call the ACTION callback for every node
    or leaf.  */