INN commit: trunk (15 files)
INN Commit
rra at isc.org
Wed Jan 7 20:50:16 UTC 2015
Date: Wednesday, January 7, 2015 @ 12:50:16
Author: iulius
Revision: 9778
No longer include portability headers in include/inn headers
Headers in include/inn can be used by other programs, and therefore
should not call headers in include/portable.
When building INN, copy portability headers into include/inn so that
they can be included.
Modified:
trunk/include/Makefile
trunk/include/inn/ (properties)
trunk/include/inn/buffer.h
trunk/include/inn/dbz.h
trunk/include/inn/defines.h
trunk/include/inn/fdflag.h
trunk/include/inn/macros.h
trunk/include/inn/messages.h
trunk/include/inn/network-innbind.h
trunk/include/inn/network.h
trunk/include/inn/vector.h
trunk/include/inn/xmalloc.h
trunk/include/inn/xwrite.h
trunk/support/getrra-c-util
trunk/support/mkmanifest
-------------------------------+
include/Makefile | 24 +++++++++++++++++++++++-
include/inn/buffer.h | 4 ++--
include/inn/dbz.h | 2 +-
include/inn/defines.h | 7 ++++---
include/inn/fdflag.h | 6 +++---
include/inn/macros.h | 2 +-
include/inn/messages.h | 2 +-
include/inn/network-innbind.h | 6 +++---
include/inn/network.h | 6 +++---
include/inn/vector.h | 2 +-
include/inn/xmalloc.h | 2 +-
include/inn/xwrite.h | 2 +-
support/getrra-c-util | 1 +
support/mkmanifest | 5 +++++
14 files changed, 50 insertions(+), 21 deletions(-)
Modified: include/Makefile
===================================================================
--- include/Makefile 2015-01-06 19:32:23 UTC (rev 9777)
+++ include/Makefile 2015-01-07 20:50:16 UTC (rev 9778)
@@ -8,7 +8,9 @@
top = ..
-ALL = inn/system.h inn/version.h
+ALL = inn/portable-getaddrinfo.h inn/portable-getnameinfo.h \
+ inn/portable-macros.h inn/portable-socket.h \
+ inn/portable-stdbool.h inn/system.h inn/version.h
EXTRA = config.h inn/paths.h
@@ -35,6 +37,26 @@
## Build rules.
+inn/portable-getaddrinfo.h: portable/getaddrinfo.h
+ $(SED) 's/"portable\//"inn\/portable-/g' portable/getaddrinfo.h \
+ > inn/portable-getaddrinfo.h
+
+inn/portable-getnameinfo.h: portable/getnameinfo.h
+ $(SED) 's/"portable\//"inn\/portable-/g' portable/getnameinfo.h \
+ > inn/portable-getnameinfo.h
+
+inn/portable-macros.h: portable/macros.h
+ $(SED) 's/"portable\//"inn\/portable-/g' portable/macros.h \
+ > inn/portable-macros.h
+
+inn/portable-socket.h: portable/socket.h
+ $(SED) 's/"portable\//"inn\/portable-/g' portable/socket.h \
+ > inn/portable-socket.h
+
+inn/portable-stdbool.h: portable/stdbool.h
+ $(SED) 's/"portable\//"inn\/portable-/g' portable/stdbool.h \
+ > inn/portable-stdbool.h
+
inn/system.h: config.h $(top)/support/mksystem
$(top)/support/mksystem $(AWK) config.h > $@
Property changes on: trunk/include/inn
___________________________________________________________________
Modified: svn:ignore
- paths.h
system.h
version.h
+ paths.h
portable-getaddrinfo.h
portable-getnameinfo.h
portable-macros.h
portable-socket.h
portable-stdbool.h
system.h
version.h
Modified: include/inn/buffer.h
===================================================================
--- include/inn/buffer.h 2015-01-06 19:32:23 UTC (rev 9777)
+++ include/inn/buffer.h 2015-01-07 20:50:16 UTC (rev 9778)
@@ -45,8 +45,8 @@
#define INN_BUFFER_H 1
#include "config.h"
-#include "portable/macros.h"
-#include "portable/stdbool.h"
+#include "inn/portable-macros.h"
+#include "inn/portable-stdbool.h"
#include <stdarg.h>
#include <sys/types.h>
Modified: include/inn/dbz.h
===================================================================
--- include/inn/dbz.h 2015-01-06 19:32:23 UTC (rev 9777)
+++ include/inn/dbz.h 2015-01-07 20:50:16 UTC (rev 9778)
@@ -3,7 +3,7 @@
/* Need the definition of HASH. */
#include "inn/libinn.h"
-#include "portable/macros.h"
+#include "inn/portable-macros.h"
BEGIN_DECLS
Modified: include/inn/defines.h
===================================================================
--- include/inn/defines.h 2015-01-06 19:32:23 UTC (rev 9777)
+++ include/inn/defines.h 2015-01-07 20:50:16 UTC (rev 9778)
@@ -21,9 +21,10 @@
#include <inn/system.h>
#include "inn/macros.h"
-#include "portable/stdbool.h"
+#include "inn/portable-stdbool.h"
-// TODO: Remove this file (defines.h), now that it has been split
-// into other headers.
+/* TODO: Remove this file (defines.h), now that it has been split
+** into other headers.
+*/
#endif /* !INN_DEFINES_H */
Modified: include/inn/fdflag.h
===================================================================
--- include/inn/fdflag.h 2015-01-06 19:32:23 UTC (rev 9777)
+++ include/inn/fdflag.h 2015-01-07 20:50:16 UTC (rev 9778)
@@ -32,9 +32,9 @@
#define INN_FDFLAG_H 1
#include "config.h"
-#include "portable/macros.h"
-#include "portable/stdbool.h"
-#include "portable/socket.h"
+#include "inn/portable-macros.h"
+#include "inn/portable-stdbool.h"
+#include "inn/portable-socket.h"
BEGIN_DECLS
Modified: include/inn/macros.h
===================================================================
--- include/inn/macros.h 2015-01-06 19:32:23 UTC (rev 9777)
+++ include/inn/macros.h 2015-01-07 20:50:16 UTC (rev 9778)
@@ -19,7 +19,7 @@
#ifndef INN_MACROS_H
#define INN_MACROS_H 1
-#include "portable/macros.h"
+#include "inn/portable-macros.h"
/*
* Used for iterating through arrays. ARRAY_SIZE returns the number of
Modified: include/inn/messages.h
===================================================================
--- include/inn/messages.h 2015-01-06 19:32:23 UTC (rev 9777)
+++ include/inn/messages.h 2015-01-07 20:50:16 UTC (rev 9778)
@@ -32,7 +32,7 @@
#define INN_MESSAGES_H 1
#include "config.h"
-#include "portable/macros.h"
+#include "inn/portable-macros.h"
#include <stdarg.h>
#include <stddef.h>
Modified: include/inn/network-innbind.h
===================================================================
--- include/inn/network-innbind.h 2015-01-06 19:32:23 UTC (rev 9777)
+++ include/inn/network-innbind.h 2015-01-07 20:50:16 UTC (rev 9778)
@@ -33,9 +33,9 @@
#define INN_NETWORK_INNBIND_H 1
#include <inn/defines.h>
-#include "portable/macros.h"
-#include "portable/socket.h"
-#include "portable/stdbool.h"
+#include "inn/portable-macros.h"
+#include "inn/portable-socket.h"
+#include "inn/portable-stdbool.h"
#include <sys/types.h>
Modified: include/inn/network.h
===================================================================
--- include/inn/network.h 2015-01-06 19:32:23 UTC (rev 9777)
+++ include/inn/network.h 2015-01-07 20:50:16 UTC (rev 9778)
@@ -34,9 +34,9 @@
#define INN_NETWORK_H 1
#include <inn/defines.h>
-#include "portable/macros.h"
-#include "portable/socket.h"
-#include "portable/stdbool.h"
+#include "inn/portable-macros.h"
+#include "inn/portable-socket.h"
+#include "inn/portable-stdbool.h"
#include <sys/types.h>
Modified: include/inn/vector.h
===================================================================
--- include/inn/vector.h 2015-01-06 19:32:23 UTC (rev 9777)
+++ include/inn/vector.h 2015-01-07 20:50:16 UTC (rev 9778)
@@ -27,7 +27,7 @@
#define INN_VECTOR_H 1
#include "config.h"
-#include "portable/macros.h"
+#include "inn/portable-macros.h"
#include <stddef.h>
Modified: include/inn/xmalloc.h
===================================================================
--- include/inn/xmalloc.h 2015-01-06 19:32:23 UTC (rev 9777)
+++ include/inn/xmalloc.h 2015-01-07 20:50:16 UTC (rev 9778)
@@ -32,7 +32,7 @@
#define INN_XMALLOC_H 1
#include "config.h"
-#include "portable/macros.h"
+#include "inn/portable-macros.h"
#include <stdarg.h>
#include <stddef.h>
Modified: include/inn/xwrite.h
===================================================================
--- include/inn/xwrite.h 2015-01-06 19:32:23 UTC (rev 9777)
+++ include/inn/xwrite.h 2015-01-07 20:50:16 UTC (rev 9778)
@@ -32,7 +32,7 @@
#define INN_XWRITE_H 1
#include "config.h"
-#include "portable/macros.h"
+#include "inn/portable-macros.h"
#include <sys/types.h>
Modified: support/getrra-c-util
===================================================================
--- support/getrra-c-util 2015-01-06 19:32:23 UTC (rev 9777)
+++ support/getrra-c-util 2015-01-07 20:50:16 UTC (rev 9778)
@@ -191,6 +191,7 @@
-e 's/\([^_]\)HAVE_STDBOOL_H/\1INN_HAVE_STDBOOL_H/g' \
-e 's/\([^_]\)HAVE_SYS_BITYPES_H/\1INN_HAVE_SYS_BITYPES_H/g' \
-e 's/\([^_]\)HAVE__BOOL/\1INN_HAVE__BOOL/g' \
+ -e 's/"portable\/\(.*\)"/"inn\/portable-\1"/g' \
${TEMP}
fi
fi
Modified: support/mkmanifest
===================================================================
--- support/mkmanifest 2015-01-06 19:32:23 UTC (rev 9777)
+++ support/mkmanifest 2015-01-07 20:50:16 UTC (rev 9778)
@@ -168,6 +168,11 @@
history/buildconfig
include/config.h
include/inn/paths.h
+include/inn/portable-getaddrinfo.h
+include/inn/portable-getnameinfo.h
+include/inn/portable-macros.h
+include/inn/portable-socket.h
+include/inn/portable-stdbool.h
include/inn/system.h
include/inn/version.h
innd/innd
More information about the inn-committers
mailing list