svn commit: r292431 - stable/9/lib/libc/resolv

[Garrett Cooper]

Author: ngie
Date: Fri Dec 18 07:00:42 2015
New Revision: 292431
URL: https://svnweb.freebsd.org/changeset/base/292431

Log:
  MFstable/10 r292430:
  
  MFC r292250:
  
  Allow users override `DEBUG` on the command line via DEBUG_FLAGS="-DDEBUG" with
  lib/libc/resolv by conditionalizing its definition
  
  Reviewed by: ume, vangyzen
  Differential Revision: https://reviews.freebsd.org/D4519

Modified:
  stable/9/lib/libc/resolv/res_init.c
  stable/9/lib/libc/resolv/res_mkquery.c
  stable/9/lib/libc/resolv/res_mkupdate.c
  stable/9/lib/libc/resolv/res_query.c
  stable/9/lib/libc/resolv/res_send.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/lib/   (props changed)
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/resolv/res_init.c
==============================================================================
--- stable/9/lib/libc/resolv/res_init.c	Fri Dec 18 06:58:44 2015	(r292430)
+++ stable/9/lib/libc/resolv/res_init.c	Fri Dec 18 07:00:42 2015	(r292431)
@@ -115,7 +115,9 @@ __FBSDID("$FreeBSD$");
 
 /*% Options.  Should all be left alone. */
 #define RESOLVSORT
-#define DEBUG
+#ifndef	DEBUG
+#define	DEBUG
+#endif
 
 #ifdef SOLARIS2
 #include <sys/systeminfo.h>

Modified: stable/9/lib/libc/resolv/res_mkquery.c
==============================================================================
--- stable/9/lib/libc/resolv/res_mkquery.c	Fri Dec 18 06:58:44 2015	(r292430)
+++ stable/9/lib/libc/resolv/res_mkquery.c	Fri Dec 18 07:00:42 2015	(r292431)
@@ -83,7 +83,9 @@ __FBSDID("$FreeBSD$");
 #include "port_after.h"
 
 /* Options.  Leave them on. */
-#define DEBUG
+#ifndef	DEBUG
+#define	DEBUG
+#endif
 
 extern const char *_res_opcodes[];
 

Modified: stable/9/lib/libc/resolv/res_mkupdate.c
==============================================================================
--- stable/9/lib/libc/resolv/res_mkupdate.c	Fri Dec 18 06:58:44 2015	(r292430)
+++ stable/9/lib/libc/resolv/res_mkupdate.c	Fri Dec 18 07:00:42 2015	(r292431)
@@ -54,7 +54,9 @@ __FBSDID("$FreeBSD$");
 #include "port_after.h"
 
 /* Options.  Leave them on. */
-#define DEBUG
+#ifndef	DEBUG
+#define	DEBUG
+#endif
 #define MAXPORT 1024
 
 static int getnum_str(u_char **, u_char *);

Modified: stable/9/lib/libc/resolv/res_query.c
==============================================================================
--- stable/9/lib/libc/resolv/res_query.c	Fri Dec 18 06:58:44 2015	(r292430)
+++ stable/9/lib/libc/resolv/res_query.c	Fri Dec 18 07:00:42 2015	(r292431)
@@ -88,7 +88,9 @@ __FBSDID("$FreeBSD$");
 #include "port_after.h"
 
 /* Options.  Leave them on. */
-#define DEBUG
+#ifndef	DEBUG
+#define	DEBUG
+#endif
 
 #if PACKETSZ > 1024
 #define MAXPACKET	PACKETSZ

Modified: stable/9/lib/libc/resolv/res_send.c
==============================================================================
--- stable/9/lib/libc/resolv/res_send.c	Fri Dec 18 06:58:44 2015	(r292430)
+++ stable/9/lib/libc/resolv/res_send.c	Fri Dec 18 07:00:42 2015	(r292431)
@@ -119,7 +119,9 @@ __FBSDID("$FreeBSD$");
 #include "un-namespace.h"
 
 /* Options.  Leave them on. */
-#define DEBUG
+#ifndef	DEBUG
+#define	DEBUG
+#endif
 #include "res_debug.h"
 #include "res_private.h"