git-svn-id: http://svn.openzap.org/svn/openzap/trunk@9 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Anthony Minessale 2007-05-17 01:54:30 +00:00
parent ae336c4894
commit fcbd79567c
6 changed files with 13 additions and 12 deletions

View File

@ -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)

View File

@ -0,0 +1,3 @@
CC=gcc
CFLAGS += -Wall -Werror -Wextra -std=c99 -pedantic -ansi

View File

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

View File

@ -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);

2
libs/openzap/src/wanpipe Normal file
View File

@ -0,0 +1,2 @@
CFLAGS +=-DZAP_WANPIPE_SUPPORT
OBJS += zap_wanpipe.o

2
libs/openzap/src/zt Normal file
View File

@ -0,0 +1,2 @@
CFLAGS +=-DZAP_ZT_SUPPORT
OBJS += zap_zt.o