remove the ENABLE_STRNATPMPERR ifdefs to see if that'll make hudson happy

diff --git a/third-party/libnatpmp/Makefile.am b/third-party/libnatpmp/Makefile.am
index 923ab169d691c127db6aec7d0c1dfab47e04568b..3fca7d53c5082a8122299b7c68d10116d5187335 100644 (file)
--- 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 9ea3a053ea6f22c1bef025c8996e07622042c6cb..8668cf11d22afdfacb4c7ce2f2870c707479aad1 100644 (file)
--- 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 9470543f76c038084a5a0f41c8f680c74e5b61e8..ac7ec95f67bf3d5a549be505297d6d39f69054f9 100644 (file)
--- 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