diff options
| author | Руслан Ижбулатов <lrn1986@gmail.com> | 2017-02-25 12:51:51 +0000 |
|---|---|---|
| committer | Руслан Ижбулатов <lrn1986@gmail.com> | 2017-02-25 21:03:24 +0000 |
| commit | 0eb3848d99441a237ba2a6585a3c054d67f28c53 (patch) | |
| tree | 91995f7c937e1f4c65b84a4bfa41c22f56e19098 /src/nat | |
| parent | 1dd57ecb97d47034672678055c2fc814728e134d (diff) | |
| download | gnunet-0eb3848d99441a237ba2a6585a3c054d67f28c53.tar.gz gnunet-0eb3848d99441a237ba2a6585a3c054d67f28c53.zip | |
W32: Splice GNUNET_memcpy macro into NAT and GNS helpers
Including gnunet_common.h is too bothersome, these programs are designed
to be relatively standalone.
Diffstat (limited to 'src/nat')
| -rw-r--r-- | src/nat/gnunet-helper-nat-client-windows.c | 2 | ||||
| -rw-r--r-- | src/nat/gnunet-helper-nat-server-windows.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/nat/gnunet-helper-nat-client-windows.c b/src/nat/gnunet-helper-nat-client-windows.c index 89dad9e7b..622f8c961 100644 --- a/src/nat/gnunet-helper-nat-client-windows.c +++ b/src/nat/gnunet-helper-nat-client-windows.c | |||
| @@ -42,6 +42,8 @@ | |||
| 42 | * - Nathan Evans | 42 | * - Nathan Evans |
| 43 | */ | 43 | */ |
| 44 | #define _GNU_SOURCE | 44 | #define _GNU_SOURCE |
| 45 | /* Instead of including gnunet_common.h */ | ||
| 46 | #define GNUNET_memcpy(dst,src,n) do { if (0 != n) { (void) memcpy (dst,src,n); } } while (0) | ||
| 45 | 47 | ||
| 46 | #define FD_SETSIZE 1024 | 48 | #define FD_SETSIZE 1024 |
| 47 | #include <winsock2.h> | 49 | #include <winsock2.h> |
diff --git a/src/nat/gnunet-helper-nat-server-windows.c b/src/nat/gnunet-helper-nat-server-windows.c index c8e1193e4..09bd02538 100644 --- a/src/nat/gnunet-helper-nat-server-windows.c +++ b/src/nat/gnunet-helper-nat-server-windows.c | |||
| @@ -41,6 +41,8 @@ | |||
| 41 | * - Christian Grothoff | 41 | * - Christian Grothoff |
| 42 | */ | 42 | */ |
| 43 | #define _GNU_SOURCE | 43 | #define _GNU_SOURCE |
| 44 | /* Instead of including gnunet_common.h */ | ||
| 45 | #define GNUNET_memcpy(dst,src,n) do { if (0 != n) { (void) memcpy (dst,src,n); } } while (0) | ||
| 44 | 46 | ||
| 45 | #define FD_SETSIZE 1024 | 47 | #define FD_SETSIZE 1024 |
| 46 | #include <winsock2.h> | 48 | #include <winsock2.h> |