Merge pull request #152 from hintjens/master

Added libsodium hook
zeromq · Apr 30, 2013 · fc75ab3 · fc75ab3
2 parents 658a712 + 3e8a16d
commit fc75ab3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/configure.ac b/configure.ac
@@ -41,7 +41,7 @@ AC_SUBST(LTVER)
 # Capture c flags
 CZMQ_ORIG_CFLAGS="${CFLAGS:-none}"
 
-# Checks for programs.
+# Checks for programs
 AC_PROG_CC
 AC_PROG_CC_C99
 AM_PROG_CC_C_O
@@ -50,9 +50,11 @@ AC_PROG_LIBTOOL
 AC_PROG_SED
 AC_PROG_AWK
 
-# Checks for libraries.
+# Checks for libraries
 AC_CHECK_LIB([pthread], [pthread_create])
+AC_CHECK_LIB([sodium], [sodium_init])
 
+# Code coverage
 AC_ARG_WITH(gcov, [AS_HELP_STRING([--with-gcov=yes/no],
                   [With GCC Code Coverage reporting.])],
                   [CZMQ_GCOV="$withval"])
@@ -209,9 +211,6 @@ AC_HEADER_TIME
 AC_TYPE_UINT32_T
 AC_C_VOLATILE
 
-# Math libraries
-AC_CHECK_LIB([m], [pow])
-
 # These options are GNU compiler specific.
 if test "x$GCC" = "xyes"; then
     CPPFLAGS="-pedantic -Werror -Wall ${CPPFLAGS}"

diff --git a/include/zhash.h b/include/zhash.h
@@ -32,7 +32,7 @@ extern "C" {
 #endif
 
 //  Opaque class structure
-typedef struct _zhash zhash_t;
+typedef struct _zhash_t zhash_t;
 
 //  @interface
 //  Callback function for zhash_foreach method

diff --git a/include/zlist.h b/include/zlist.h
@@ -32,7 +32,7 @@ extern "C" {
 #endif
 
 //  Opaque class structure
-typedef struct _zlist zlist_t;
+typedef struct _zlist_t zlist_t;
 
 //  @interface
 //  Comparison function for zlist_sort method

diff --git a/src/zhash.c b/src/zhash.c
@@ -57,7 +57,7 @@ typedef struct _item_t {
 //  ---------------------------------------------------------------------
 //  Structure of our class
 
-struct _zhash {
+struct _zhash_t {
     size_t size;                //  Current size of hash table
     size_t limit;               //  Current hash table limit
     item_t **items;             //  Array of items

diff --git a/src/zlist.c b/src/zlist.c
@@ -46,7 +46,7 @@ typedef struct _node_t {
 //  ---------------------------------------------------------------------
 //  Structure of our class
 
-struct _zlist {
+struct _zlist_t {
     node_t *head;               //  First item in list, if any
     node_t *tail;               //  Last item in list, if any
     node_t *cursor;             //  Current cursors for iteration