From 2705db2b6a7faa6353c6e30bf460cb776e222cea Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 15 Jul 2008 17:09:10 +0000 Subject: [PATCH] remove the ENABLE_STRNATPMPERR ifdefs to see if that'll make hudson happy --- third-party/libnatpmp/Makefile.am | 2 -- third-party/libnatpmp/natpmp.c | 2 -- third-party/libnatpmp/natpmp.h | 2 -- 3 files changed, 6 deletions(-) diff --git a/third-party/libnatpmp/Makefile.am b/third-party/libnatpmp/Makefile.am index 923ab169d..3fca7d53c 100644 --- a/third-party/libnatpmp/Makefile.am +++ b/third-party/libnatpmp/Makefile.am @@ -1,7 +1,5 @@ noinst_LIBRARIES = libnatpmp.a -AM_CPPFLAGS = -DENABLE_STRNATPMPERR - libnatpmp_a_SOURCES = \ getgateway.c \ natpmp.c diff --git a/third-party/libnatpmp/natpmp.c b/third-party/libnatpmp/natpmp.c index 9ea3a053e..8668cf11d 100644 --- a/third-party/libnatpmp/natpmp.c +++ b/third-party/libnatpmp/natpmp.c @@ -267,7 +267,6 @@ int readnatpmpresponseorretry(natpmp_t * p, natpmpresp_t * response) return n; } -#ifdef ENABLE_STRNATPMPERR const char * strnatpmperr(int r) { const char * s; @@ -335,5 +334,4 @@ const char * strnatpmperr(int r) } return s; } -#endif diff --git a/third-party/libnatpmp/natpmp.h b/third-party/libnatpmp/natpmp.h index 9470543f7..ac7ec95f6 100644 --- a/third-party/libnatpmp/natpmp.h +++ b/third-party/libnatpmp/natpmp.h @@ -179,8 +179,6 @@ LIBSPEC int getnatpmprequesttimeout(natpmp_t * p, struct timeval * timeout); * NATPMP_ERR_UNDEFINEDERROR */ LIBSPEC int readnatpmpresponseorretry(natpmp_t * p, natpmpresp_t * response); -#ifdef ENABLE_STRNATPMPERR LIBSPEC const char * strnatpmperr(int t); -#endif #endif