Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/include/netdb.h,v
rcsdiff: /ftp/cvs/cvsroot/src/include/netdb.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.65
retrieving revision 1.65.2.1
diff -u -p -r1.65 -r1.65.2.1
--- src/include/netdb.h	2012/03/17 21:57:48	1.65
+++ src/include/netdb.h	2013/06/23 06:28:49	1.65.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: netdb.h,v 1.65 2012/03/17 21:57:48 christos Exp $	*/
+/*	$NetBSD: netdb.h,v 1.65.2.1 2013/06/23 06:28:49 tls Exp $	*/
 
 /*
  * ++Copyright++ 1980, 1983, 1988, 1993
@@ -90,10 +90,9 @@
 #ifndef _NETDB_H_
 #define	_NETDB_H_
 
-#include <machine/ansi.h>
+#include <sys/cdefs.h>
 #include <machine/endian_machdep.h>
 #include <sys/ansi.h>
-#include <sys/cdefs.h>
 #include <sys/featuretest.h>
 #include <inttypes.h>
 /*
@@ -267,11 +266,18 @@ struct addrinfo {
 #define	AI_CANONNAME	0x00000002 /* fill ai_canonname */
 #define	AI_NUMERICHOST	0x00000004 /* prevent host name resolution */
 #define	AI_NUMERICSERV	0x00000008 /* prevent service name resolution */
+#define	AI_ADDRCONFIG	0x00000400 /* only if any address is assigned */
 /* valid flags for addrinfo (not a standard def, apps should not use it) */
+#ifdef _NETBSD_SOURCE
+#define	AI_SRV		0x00000800 /* do _srv lookups */
+#define	AI_MASK	\
+    (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV | \
+    AI_ADDRCONFIG | AI_SRV)
+#else
 #define	AI_MASK	\
     (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV | \
     AI_ADDRCONFIG)
-#define	AI_ADDRCONFIG	0x00000400 /* only if any address is assigned */
+#endif
 #endif
 
 #if (_POSIX_C_SOURCE - 0) >= 200112L || (_XOPEN_SOURCE - 0) >= 520 || \