update

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@9 a93c3328-9c30-0410-af19-c9cd2b2d52af

libs/freetdm/src/Makefile

@@ -29,17 +29,11 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-CC=gcc
 OBJS=hashtable.o hashtable_itr.o openzap.o zap_config.o
-CFLAGS=$(USER_CFLAGS) -Iinclude -Wall -Werror -Wextra -std=c99 -pedantic -ansi
+CFLAGS=$(ZAP_CFLAGS) -Iinclude 
 MYLIB=libopenzap.a
 
-CFLAGS +=-DZAP_WANPIPE_SUPPORT
-OBJS += zap_wanpipe.o
-
-#CFLAGS +=-DZAP_ZT_SUPPORT
-#OBJS += zap_zt.o
-
+include general.makefile $(ZAP_MODS)
 
 $(MYLIB): $(OBJS)
 	ar rcs $(MYLIB) $(OBJS)

libs/freetdm/src/general.makefile

+CC=gcc
+CFLAGS += -Wall -Werror -Wextra -std=c99 -pedantic -ansi
+

libs/freetdm/src/include/hashtable_private.h

@@ -25,7 +25,7 @@ struct hashtable {
 
 /*****************************************************************************/
 unsigned int
-hash(struct hashtable *h, void *k);
+hash(struct hashtable *h, const void *k);
 
 /*****************************************************************************/
 /* indexFor */

libs/freetdm/src/openzap.c

@@ -228,17 +228,17 @@ zap_status_t zap_global_init(void)
 	zap_config_t cfg;
 	char *var, *val;
 	unsigned configured = 0;
-	zap_software_interface_t *zint = NULL;
+	zap_software_interface_t *zint;
 	
-	zint, 0;
-
 	globals.interface_hash = create_hashtable(16, hashfromstring, equalkeys);
+	zint = NULL;
 
 #ifdef ZAP_WANPIPE_SUPPORT
 	if (wanpipe_init(&zint) == ZAP_SUCCESS) {
 		hashtable_insert(globals.interface_hash, (void *)zint->name, zint);
 	}
 #endif
+	zint = NULL;
 #ifdef ZAP_ZT_SUPPORT
 	if (zt_init(&zint) == ZAP_SUCCESS) {
 		hashtable_insert(globals.interface_hash, (void *)zint->name, zint);

libs/freetdm/src/wanpipe

+CFLAGS +=-DZAP_WANPIPE_SUPPORT
+OBJS += zap_wanpipe.o

libs/freetdm/src/zt

+CFLAGS +=-DZAP_ZT_SUPPORT
+OBJS += zap_zt.o