Revert "Do not use sized constants in public headers"

This reverts commit 22c01e96f7b2ae9923e1baa50bfe3c0d22297a7d.

This is a Red Hat specific patch that does not belong into upstream

1 files changed, 29 insertions, 0 deletions

diff --git a/ares_rules.h b/ares_rules.h
index 334af51..f94c5b5 100644
--- a/ares_rules.h
+++ b/ares_rules.h
@@ -68,11 +68,21 @@
  * Verify that some macros are actually defined.
  */
 
+#ifndef CARES_SIZEOF_LONG
+#  error "CARES_SIZEOF_LONG definition is missing!"
+   Error Compilation_aborted_CARES_SIZEOF_LONG_is_missing
+#endif
+
 #ifndef CARES_TYPEOF_ARES_SOCKLEN_T
 #  error "CARES_TYPEOF_ARES_SOCKLEN_T definition is missing!"
    Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_is_missing
 #endif
 
+#ifndef CARES_SIZEOF_ARES_SOCKLEN_T
+#  error "CARES_SIZEOF_ARES_SOCKLEN_T definition is missing!"
+   Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_is_missing
+#endif
+
 /*
  * Macros private to this header file.
  */
@@ -82,6 +92,25 @@
 #define CareschkszGE(t1, t2) sizeof(t1) >= sizeof(t2) ? 1 : -1
 
 /*
+ * Verify that the size previously defined and expected for long
+ * is the same as the one reported by sizeof() at compile time.
+ */
+
+typedef char
+  __cares_rule_01__
+    [CareschkszEQ(long, CARES_SIZEOF_LONG)];
+
+/*
+ * Verify that the size previously defined and expected for
+ * ares_socklen_t is actually the the same as the one reported
+ * by sizeof() at compile time.
+ */
+
+typedef char
+  __cares_rule_02__
+    [CareschkszEQ(ares_socklen_t, CARES_SIZEOF_ARES_SOCKLEN_T)];
+
+/*
  * Verify at compile time that the size of ares_socklen_t as reported
  * by sizeof() is greater or equal than the one reported for int for
  * the current compilation.