[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 10/14: W32: Splice GNUNET_memcpy macro into NAT an
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 10/14: W32: Splice GNUNET_memcpy macro into NAT and GNS helpers |
Date: |
Sat, 25 Feb 2017 22:05:00 +0100 |
This is an automated email from the git hooks/post-receive script.
lrn pushed a commit to branch master
in repository gnunet.
commit 0eb3848d99441a237ba2a6585a3c054d67f28c53
Author: Руслан Ижбулатов <address@hidden>
AuthorDate: Sat Feb 25 12:51:51 2017 +0000
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.
---
src/gns/w32nsp-resolve.c | 3 +++
src/nat/gnunet-helper-nat-client-windows.c | 2 ++
src/nat/gnunet-helper-nat-server-windows.c | 2 ++
3 files changed, 7 insertions(+)
diff --git a/src/gns/w32nsp-resolve.c b/src/gns/w32nsp-resolve.c
index 1de1a3657..82f15c6cc 100644
--- a/src/gns/w32nsp-resolve.c
+++ b/src/gns/w32nsp-resolve.c
@@ -22,6 +22,9 @@
* @brief W32 integration for GNS
* @author LRN
*/
+/* Instead of including gnunet_common.h */
+#define GNUNET_memcpy(dst,src,n) do { if (0 != n) { (void) memcpy (dst,src,n);
} } while (0)
+
#include <ws2tcpip.h>
#include <windows.h>
#include <nspapi.h>
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 @@
* - Nathan Evans
*/
#define _GNU_SOURCE
+/* Instead of including gnunet_common.h */
+#define GNUNET_memcpy(dst,src,n) do { if (0 != n) { (void) memcpy (dst,src,n);
} } while (0)
#define FD_SETSIZE 1024
#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 @@
* - Christian Grothoff
*/
#define _GNU_SOURCE
+/* Instead of including gnunet_common.h */
+#define GNUNET_memcpy(dst,src,n) do { if (0 != n) { (void) memcpy (dst,src,n);
} } while (0)
#define FD_SETSIZE 1024
#include <winsock2.h>
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] branch master updated (a57e7703f -> 903c035f7), gnunet, 2017/02/25
- [GNUnet-SVN] [gnunet] 04/14: W32: Fix a possible control flow error, gnunet, 2017/02/25
- [GNUnet-SVN] [gnunet] 12/14: Fix an initialization warning (GCC bug 53119), gnunet, 2017/02/25
- [GNUnet-SVN] [gnunet] 06/14: W32: Fix wrong format strings, gnunet, 2017/02/25
- [GNUnet-SVN] [gnunet] 10/14: W32: Splice GNUNET_memcpy macro into NAT and GNS helpers,
gnunet <=
- [GNUnet-SVN] [gnunet] 09/14: Silence a GCC warning in gnunet-nat.c, gnunet, 2017/02/25
- [GNUnet-SVN] [gnunet] 14/14: W32: Fix msg allocation in gns helper service, gnunet, 2017/02/25
- [GNUnet-SVN] [gnunet] 11/14: W32: cast ntohl() result to uint32_t, gnunet, 2017/02/25
- [GNUnet-SVN] [gnunet] 01/14: W32: adapt the code to GNUNET_memcpy() that returns nothing, gnunet, 2017/02/25
- [GNUnet-SVN] [gnunet] 02/14: Use GNU printf format, gnunet, 2017/02/25
- [GNUnet-SVN] [gnunet] 05/14: W32: Fix the conditaions for the ifconfig function, gnunet, 2017/02/25
- [GNUnet-SVN] [gnunet] 13/14: W32: port gnunet-gns-import to new zone iterator callback API, gnunet, 2017/02/25
- [GNUnet-SVN] [gnunet] 03/14: Shuffle some vars around to fix a warning, gnunet, 2017/02/25
- [GNUnet-SVN] [gnunet] 07/14: W32: placate GCC by initializing lsocks_write_fd to NULL, gnunet, 2017/02/25
- [GNUnet-SVN] [gnunet] 08/14: Link libgnunetblockgroup to libgnunetblock, gnunet, 2017/02/25