Add compatibility isc/boolean.h and isc/int.h headers

(cherry picked from commit 0dad73aafa878dcd6a02ae05ee4bd2444b57049c)

diff --git a/lib/isc/include/isc/boolean.h b/lib/isc/include/isc/boolean.h
new file mode 100644 (file)
index 0000000..2eebefa
--- /dev/null
+++ b/lib/isc/include/isc/boolean.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+#pragma once
+
+/*! \file isc/boolean.h */
+
+#define isc_boolean_t bool
+#define isc_boolean_false false
+#define isc_boolean_true true
+
+#define ISC_FALSE false
+#define ISC_TRUE true
+#define ISC_TF(x) (!!(x))

diff --git a/lib/isc/include/isc/int.h b/lib/isc/include/isc/int.h
new file mode 100644 (file)
index 0000000..9bf3066
--- /dev/null
+++ b/lib/isc/include/isc/int.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+#pragma once
+
+/*! \file */
+
+#include <inttypes.h>
+
+typedef int8_t                         isc_int8_t;
+typedef        uint8_t                         isc_uint8_t;
+typedef int16_t                                isc_int16_t;
+typedef uint16_t                       isc_uint16_t;
+typedef int32_t                                isc_int32_t;
+typedef uint32_t                       isc_uint32_t;
+typedef int64_t                                isc_int64_t;
+typedef uint64_t                       isc_uint64_t;
+
+#define ISC_INT8_MIN   INT8_MIN
+#define ISC_INT8_MAX   INT8_MAX
+#define ISC_UINT8_MAX  UINT8_MAX
+
+#define ISC_INT16_MIN  INT16_MIN
+#define ISC_INT16_MAX  INT16_MAX
+#define ISC_UINT16_MAX UINT16_MAX
+
+#define ISC_INT32_MIN  INT32_MIN
+#define ISC_INT32_MAX  INT32_MAX
+#define ISC_UINT32_MAX UINT32_MAX
+
+#define ISC_INT64_MIN  INT64_MIN
+#define ISC_INT64_MAX  INT64_MAX
+#define ISC_UINT64_MAX UINT64_MAX

diff --git a/lib/isc/win32/libisc.vcxproj.filters.in b/lib/isc/win32/libisc.vcxproj.filters.in
index b402a1b783d2d65d0b83d4f1193ca0b56dfb8486..d6a52341eb65c90a157057e827ce587f2b24b6e2 100644 (file)
--- a/lib/isc/win32/libisc.vcxproj.filters.in
+++ b/lib/isc/win32/libisc.vcxproj.filters.in
@@ -49,6 +49,9 @@
     <ClInclude Include="..\include\isc\bind9.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\isc\boolean.h">
+      <Filter>Library Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\include\isc\buffer.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>
@@ -109,6 +112,9 @@
     <ClInclude Include="..\include\isc\httpd.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\isc\int.h">
+      <Filter>Win32 Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\include\isc\interfaceiter.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>

diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in
index ef9c350b95fd0f88cd07de7193ec2e4efcb97aa3..fb9222a87108ecc28da43a1a58554829788eb7c0 100644 (file)
--- a/lib/isc/win32/libisc.vcxproj.in
+++ b/lib/isc/win32/libisc.vcxproj.in
@@ -306,6 +306,7 @@ copy InstallFiles ..\Build\Release\
     <ClInclude Include="..\include\isc\base32.h" />
     <ClInclude Include="..\include\isc\base64.h" />
     <ClInclude Include="..\include\isc\bind9.h" />
+    <ClInclude Include="..\include\isc\boolean.h" />
     <ClInclude Include="..\include\isc\buffer.h" />
     <ClInclude Include="..\include\isc\bufferlist.h" />
     <ClInclude Include="..\include\isc\commandline.h" />
@@ -326,6 +327,7 @@ copy InstallFiles ..\Build\Release\
     <ClInclude Include="..\include\isc\hmacsha.h" />
     <ClInclude Include="..\include\isc\ht.h" />
     <ClInclude Include="..\include\isc\httpd.h" />
+    <ClInclude Include="..\include\isc\int.h" />
     <ClInclude Include="..\include\isc\interfaceiter.h" />
     <ClInclude Include="..\include\isc\iterated_hash.h" />
     <ClInclude Include="..\include\isc\json.h" />

diff --git a/util/copyrights b/util/copyrights
index 4b7642d68f690a7e13a5ed4a95c1074d15e06d9c..468916df366eb5d7bc78518187d5fb923cccc969 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -3775,6 +3775,7 @@
 ./lib/isc/include/isc/base32.h                 C       2008,2014,2016,2018
 ./lib/isc/include/isc/base64.h                 C       1999,2000,2001,2004,2005,2006,2007,2016,2018
 ./lib/isc/include/isc/bind9.h                  C       2009,2013,2016,2018
+./lib/isc/include/isc/boolean.h                        C       2018
 ./lib/isc/include/isc/buffer.h                 C       1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2010,2012,2014,2016,2017,2018
 ./lib/isc/include/isc/bufferlist.h             C       1999,2000,2001,2004,2005,2006,2007,2016,2018
 ./lib/isc/include/isc/commandline.h            C       1999,2000,2001,2004,2005,2006,2007,2015,2016,2018
@@ -3796,6 +3797,7 @@
 ./lib/isc/include/isc/hmacsha.h                        C       2005,2006,2007,2009,2014,2016,2017,2018
 ./lib/isc/include/isc/ht.h                     C       2016,2018
 ./lib/isc/include/isc/httpd.h                  C       2006,2007,2008,2014,2016,2018
+./lib/isc/include/isc/int.h                    C       2018
 ./lib/isc/include/isc/interfaceiter.h          C       1999,2000,2001,2004,2005,2006,2007,2016,2018
 ./lib/isc/include/isc/ipv6.h                   C       1999,2000,2001,2002,2004,2005,2007,2016,2018
 ./lib/isc/include/isc/iterated_hash.h          C       2008,2014,2016,2018