- (djm) Make sure rijndael.c picks config.h

 - (djm) Ensure that u_char gets defined

diff --git a/acconfig.h b/acconfig.h
index 53f64220c417fd522ff78ff83e624f9f7186393f..ebe28622a16d366db36fac206bde54c5a43fb7c6 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -253,6 +253,7 @@
 #undef HAVE_UINTXX_T
 #undef HAVE_INT64_T
 #undef HAVE_U_INT64_T
+#undef HAVE_U_CHAR
 #undef HAVE_SOCKLEN_T
 #undef HAVE_SIZE_T
 #undef HAVE_SSIZE_T

diff --git a/configure.in b/configure.in
index 8f4a53e05edfd7efd0bb16c218306cf05d8e63ce..bee136ed353bb3000e3f33204888fe7754d82219 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -910,6 +910,21 @@ then
        ) 
 fi
 
+
+AC_CACHE_CHECK([for u_char], ac_cv_have_u_char, [
+       AC_TRY_COMPILE(
+               [
+#include <sys/types.h>
+               ],
+               [ u_char foo; foo = 125; ],
+               [ ac_cv_have_u_char="yes" ],
+               [ ac_cv_have_u_char="no" ]
+       )
+])
+if test "x$ac_cv_have_u_char" = "xyes" ; then
+       AC_DEFINE(HAVE_U_CHAR)
+fi
+
 AC_CACHE_CHECK([for socklen_t], ac_cv_have_socklen_t, [
        AC_TRY_COMPILE(
                [

diff --git a/defines.h b/defines.h
index 0d745120bf3200be1ef8f493112af612ead5eff6..70ebe18a41d7843d464b1a20ff3644b1efbf33c2 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -238,6 +238,11 @@ typedef unsigned long long int u_int64_t;
 # define HAVE_LONG_LONG_INT 1
 #endif
 
+#ifndef HAVE_U_CHAR
+typedef unsigned char u_char;
+# define HAVE_U_CHAR
+#endif /* HAVE_U_CHAR */
+
 #ifndef HAVE_SOCKLEN_T
 typedef unsigned int socklen_t;
 # define HAVE_SOCKLEN_T

diff --git a/rijndael.c b/rijndael.c
index 1478c12237a400343b7bdc81a5ddadf880b79b00..f28a9c66997be614ddc810b18da3a90a4fc55b84 100644 (file)
--- a/rijndael.c
+++ b/rijndael.c
@@ -25,6 +25,8 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>