Move general macros in dnsmasq.h

This commit is contained in:
Giovanni Bajo
2012-04-25 17:40:13 +02:00
committed by Simon Kelley
parent 02f9b76418
commit 28c625572b
2 changed files with 3 additions and 3 deletions

View File

@@ -56,6 +56,9 @@ typedef unsigned short u16;
typedef unsigned int u32; typedef unsigned int u32;
typedef unsigned long long u64; typedef unsigned long long u64;
#define countof(x) (long)(sizeof(x) / sizeof(x[0]))
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#include "dns-protocol.h" #include "dns-protocol.h"
#include "dhcp-protocol.h" #include "dhcp-protocol.h"
#ifdef HAVE_DHCP6 #ifdef HAVE_DHCP6

View File

@@ -8,9 +8,6 @@
#define SERIAL_LT -1 #define SERIAL_LT -1
#define SERIAL_GT 1 #define SERIAL_GT 1
#define countof(x) (long)(sizeof(x) / sizeof(x[0]))
#define MIN(a,b) ((a) < (b) ? (a) : (b))
/* Updated registry that merges various RFCs: /* Updated registry that merges various RFCs:
https://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.xml */ https://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.xml */
static const VerifyAlg valgs[] = static const VerifyAlg valgs[] =