1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
commit f376ab72bc4de0b45f4e10c9b287b7ffe2a1fcd1
Author: Thomas Bernard <miniupnp@free.fr>
Date: Thu Apr 10 23:09:44 2014 +0200
remove declspec.h problems. still has to be fixed definitely
diff --git a/getgateway.h b/getgateway.h
index d868f80..b3e17c6 100644
--- a/getgateway.h
+++ b/getgateway.h
@@ -1,6 +1,6 @@
/* $Id: getgateway.h,v 1.7 2013/09/10 20:09:04 nanard Exp $ */
/* libnatpmp
-Copyright (c) 2007-2013, Thomas BERNARD
+Copyright (c) 2007-2014, Thomas BERNARD
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -38,12 +38,12 @@ typedef unsigned short uint16_t;
#endif
#define in_addr_t uint32_t
#endif
-#include "declspec.h"
+/* #include "declspec.h" */
/* getdefaultgateway() :
* return value :
* 0 : success
* -1 : failure */
-LIBSPEC int getdefaultgateway(in_addr_t * addr);
+/* LIBSPEC */int getdefaultgateway(in_addr_t * addr);
#endif
diff --git a/natpmp.h b/natpmp.h
index 62d113f..2399afb 100644
--- a/natpmp.h
+++ b/natpmp.h
@@ -1,6 +1,6 @@
/* $Id: natpmp.h,v 1.19 2014/04/01 09:39:29 nanard Exp $ */
/* libnatpmp
-Copyright (c) 2007-2013, Thomas BERNARD
+Copyright (c) 2007-2014, Thomas BERNARD
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -48,10 +48,12 @@ typedef unsigned short uint16_t;
#define in_addr_t uint32_t
#include "declspec.h"
#else /* WIN32 */
+#define LIBSPEC
#include <netinet/in.h>
#endif /* WIN32 */
-#include "declspec.h"
+/* causes problem when installing. Maybe should it be inlined ? */
+/* #include "declspec.h" */
typedef struct {
int s; /* socket */
|