From a6b947e0ca8b114e838f4eeb65dddb5e79807d5c Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Mon, 21 Sep 2015 23:58:00 +0200
Subject: [PATCH] move READNUxx/WRITENUxx macros to macros.h

---
 miniupnpd/macros.h | 35 +++++++++++++++++++++++++++++++++--
 miniupnpd/natpmp.c | 33 +--------------------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/miniupnpd/macros.h b/miniupnpd/macros.h
index f6f7c16..b7398fb 100644
--- a/miniupnpd/macros.h
+++ b/miniupnpd/macros.h
@@ -1,7 +1,7 @@
 /* $Id: macros.h,v 1.1 2012/04/30 20:37:56 nanard Exp $ */
 /* MiniUPnP project
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
- * (c) 2012 Thomas Bernard
+ * (c) 2012-2015 Thomas Bernard
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
@@ -10,5 +10,36 @@
 
 #define UNUSED(arg)	(void)(arg)
 
-#endif
+#include <stdint.h>
 
+#define INLINE static inline
+/* theses macros are designed to read/write unsigned short/long int
+ * from an unsigned char array in network order (big endian).
+ * Avoid pointer casting, so avoid accessing unaligned memory, which
+ * can crash with some cpu's */
+INLINE uint32_t readnu32(const uint8_t * p)
+{
+	return (p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3]);
+}
+#define READNU32(p) readnu32(p)
+INLINE uint16_t readnu16(const uint8_t * p)
+{
+	return (p[0] << 8 | p[1]);
+}
+#define READNU16(p) readnu16(p)
+INLINE void writenu32(uint8_t * p, uint32_t n)
+{
+	p[0] = (n & 0xff000000) >> 24;
+	p[1] = (n & 0xff0000) >> 16;
+	p[2] = (n & 0xff00) >> 8;
+	p[3] = n & 0xff;
+}
+#define WRITENU32(p, n) writenu32(p, n)
+INLINE void writenu16(uint8_t * p, uint16_t n)
+{
+	p[0] = (n & 0xff00) >> 8;
+	p[1] = n & 0xff;
+}
+#define WRITENU16(p, n) writenu16(p, n)
+
+#endif /* MACROS_H_INCLUDED */
diff --git a/miniupnpd/natpmp.c b/miniupnpd/natpmp.c
index 25ff586..2a6ce9b 100644
--- a/miniupnpd/natpmp.c
+++ b/miniupnpd/natpmp.c
@@ -29,36 +29,6 @@
 
 #ifdef ENABLE_NATPMP
 
-#define INLINE static inline
-/* theses macros are designed to read/write unsigned short/long int
- * from an unsigned char array in network order (big endian).
- * Avoid pointer casting, so avoid accessing unaligned memory, which
- * can crash with some cpu's */
-INLINE uint32_t readnu32(const uint8_t * p)
-{
-	return (p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3]);
-}
-#define READNU32(p) readnu32(p)
-INLINE uint16_t readnu16(const uint8_t * p)
-{
-	return (p[0] << 8 | p[1]);
-}
-#define READNU16(p) readnu16(p)
-INLINE void writenu32(uint8_t * p, uint32_t n)
-{
-	p[0] = (n & 0xff000000) >> 24;
-	p[1] = (n & 0xff0000) >> 16;
-	p[2] = (n & 0xff00) >> 8;
-	p[3] = n & 0xff;
-}
-#define WRITENU32(p, n) writenu32(p, n)
-INLINE void writenu16(uint8_t * p, uint16_t n)
-{
-	p[0] = (n & 0xff00) >> 8;
-	p[1] = n & 0xff;
-}
-#define WRITENU16(p, n) writenu16(p, n)
-
 int OpenAndConfNATPMPSocket(in_addr_t addr)
 {
 	int snatpmp;
@@ -513,5 +483,4 @@ void SendNATPMPPublicAddressChangeNotification(int * sockets, int n_sockets)
 	}
 }
 
-#endif
-
+#endif /* ENABLE_NATPMP */