diff options
| -rw-r--r-- | util/ChangeLog | 5 | ||||
| -rw-r--r-- | util/Makefile.am | 11 | ||||
| -rw-r--r-- | util/http.c | 6 |
3 files changed, 14 insertions, 8 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 6abc8c30d..6c5e7d08b 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,8 @@ +2009-03-13 David Shaw <[email protected]> + + * Makefile.am, http.c (start_server): Minor tweaks to get + http-test compiling again. + 2008-09-05 David Shaw <[email protected]> * Makefile.am: Use $(CC) instead of "cc" to compile, as the user diff --git a/util/Makefile.am b/util/Makefile.am index 861f2dccb..9907d4d03 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 1998, 1999, 2000, 2001, 2005 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2001, 2005, 2006, 2008 +# 2009 Free Software Foundation, Inc. # # This file is part of GnuPG. # @@ -64,17 +65,17 @@ libcompat_a_DEPENDENCIES = @LIBOBJS@ libcompat_a_LIBADD = @LIBOBJS@ http-test: http.c - $(CC) -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ + $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \ -DTEST -o http-test http.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ srv-test: srv.c - $(CC) -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ + $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \ -DTEST -o srv-test srv.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ pka-test: pka.c - $(CC) -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ + $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \ -DTEST -o pka-test pka.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ cert-test: cert.c - $(CC) -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ + $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \ -DTEST -o cert-test cert.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ diff --git a/util/http.c b/util/http.c index 042e2fb49..9acd146ec 100644 --- a/util/http.c +++ b/util/http.c @@ -1,6 +1,6 @@ /* http.c - HTTP protocol handler * Copyright (C) 1999, 2001, 2002, 2003, 2004, - * 2005 Free Software Foundation, Inc. + * 2005, 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -713,7 +713,7 @@ parse_response( HTTP_HD hd ) #ifdef TEST static int -start_server() +start_server(void) { struct sockaddr_in mya; struct sockaddr_in peer; @@ -1062,7 +1062,7 @@ main(int argc, char **argv) } release_parsed_uri( uri ); uri = NULL; - rc = http_open_document( &hd, *argv, 0, NULL ); + rc = http_open_document( &hd, *argv, NULL, 0, NULL ); if( rc ) { log_error("can't get `%s': %s\n", *argv, g10_errstr(rc)); return 1; |