INN commit: trunk/include (Makefile portable/stdbool.h)

INN Commit rra at isc.org
Tue Mar 17 20:29:20 UTC 2015


    Date: Tuesday, March 17, 2015 @ 13:29:20
  Author: iulius
Revision: 9793

Add "INN_" prefix in include/inn header files when needed

Modified:
  trunk/include/Makefile
  trunk/include/portable/stdbool.h

--------------------+
 Makefile           |    3 +++
 portable/stdbool.h |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

Modified: Makefile
===================================================================
--- Makefile	2015-03-17 20:10:25 UTC (rev 9792)
+++ Makefile	2015-03-17 20:29:20 UTC (rev 9793)
@@ -51,10 +51,13 @@
 
 inn/portable-socket.h: portable/socket.h
 	$(SED) 's/"portable\//"inn\/portable-/g' portable/socket.h \
+	  | $(SED) -e 's/HAVE_INET6/INN_HAVE_INET6/g' \
 	  > inn/portable-socket.h
 
 inn/portable-stdbool.h: portable/stdbool.h
 	$(SED) 's/"portable\//"inn\/portable-/g' portable/stdbool.h \
+	  | $(SED) -e 's/HAVE__BOOL/INN_HAVE__BOOL/g' \
+	           -e 's/HAVE_STDBOOL_H/INN_HAVE_STDBOOL_H/g' \
 	  > inn/portable-stdbool.h
 
 inn/system.h: config.h $(top)/support/mksystem

Modified: portable/stdbool.h
===================================================================
--- portable/stdbool.h	2015-03-17 20:10:25 UTC (rev 9792)
+++ portable/stdbool.h	2015-03-17 20:29:20 UTC (rev 9793)
@@ -31,10 +31,10 @@
 # include "config.h"
 #endif
 
-#if INN_HAVE_STDBOOL_H
+#if HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
-# if INN_HAVE__BOOL
+# if HAVE__BOOL
 #  define bool _Bool
 # else
 #  ifdef __cplusplus



More information about the inn-committers mailing list