rename declspec.h -> natpmp_declspec.h

miniupnp · Oct 25, 2015 · 1d11336 · 1d11336
1 parent cf7f452
commit 1d11336
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -185,7 +185,7 @@ endif
 
 # DO NOT DELETE
 
-natpmp.o: natpmp.h getgateway.h declspec.h
-getgateway.o: getgateway.h declspec.h
-testgetgateway.o: getgateway.h declspec.h
+natpmp.o: natpmp.h getgateway.h natpmp_declspec.h
+getgateway.o: getgateway.h natpmp_declspec.h
+testgetgateway.o: getgateway.h natpmp_declspec.h
 natpmpc.o: natpmp.h
diff --git a/natpmp.h b/natpmp.h
@@ -46,14 +46,10 @@ typedef unsigned long uint32_t;
 typedef unsigned short uint16_t;
 #endif	/* !defined(_MSC_VER) || _MSC_VER >= 1600 */
 #define in_addr_t uint32_t
-#include "declspec.h"
 #else	/* _WIN32 */
-#define NATPMP_LIBSPEC
 #include <netinet/in.h>
 #endif	/* _WIN32 */
-
-/* causes problem when installing. Maybe should it be inlined ? */
-/* #include "declspec.h" */
+#include "natpmp_declspec.h"
 
 typedef struct {
 	int s;	/* socket */

diff --git a/declspec.h → natpmp_declspec.h b/declspec.h → natpmp_declspec.h