From: Damien Miller <djm@mindrot.org>
Date: Sun, 14 Nov 1999 22:56:06 +0000 (+1100)
Subject: Solaris compile fixes
X-Git-Tag: V_1_2_PRE12~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a6e668ac6607529a01a0ccd8471deec9eaa5b08;p=thirdparty%2Fopenssh-portable.git

Solaris compile fixes
---

diff --git a/ChangeLog b/ChangeLog
index 8194b7d41..15f2e16e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+19991114
+ - Solaris compilation fixes (still imcomplete)
+
 19991113
  - Build patch from Niels Kristian Bech Jensen <nkbj@image.dk>
    - Don't install config files if they already exist
diff --git a/acconfig.h b/acconfig.h
index ac60cd4a4..e5eca5b30 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -39,3 +39,11 @@ enum
 #define SHUT_RDWR SHUT_RDWR
 };
 #endif
+
+#if !defined(u_int32_t) && defined(uint32_t)
+#define u_int32_t uint32_t
+#endif
+
+#if !defined(u_int16_t) && defined(uint16_t)
+#define u_int16_t uint16_t
+#endif
diff --git a/configure.in b/configure.in
index bd34e6ddc..cd0c9a3de 100644
--- a/configure.in
+++ b/configure.in
@@ -79,7 +79,7 @@ AC_ARG_WITH(random,
 	[  --with-random=FILE      read randomness from FILE (default /dev/urandom)],
 	[
 		RANDOM_POOL="$withval";
-		AC_DEFINE(RANDOM_POOL, "$RANDOM_POOL")
+		AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL")
 	],
 	[
 		dnl Check for random device