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

- (djm) Ensure that u_char gets defined
This commit is contained in:
Damien Miller 2001-09-15 21:31:54 +10:00
parent 85085cb96d
commit 58be738ac8
4 changed files with 26 additions and 3 deletions

View File

@ -1,4 +1,4 @@
/* $Id: acconfig.h,v 1.114 2001/08/16 00:09:50 mouring Exp $ */
/* $Id: acconfig.h,v 1.115 2001/09/15 11:31:54 djm Exp $ */
#ifndef _CONFIG_H
#define _CONFIG_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

View File

@ -1,4 +1,4 @@
# $Id: configure.in,v 1.307 2001/08/16 00:09:50 mouring Exp $
# $Id: configure.in,v 1.308 2001/09/15 11:31:54 djm Exp $
AC_INIT(ssh.c)
@ -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(
[

View File

@ -1,7 +1,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
/* $Id: defines.h,v 1.70 2001/08/16 00:09:50 mouring Exp $ */
/* $Id: defines.h,v 1.71 2001/09/15 11:31:54 djm Exp $ */
/* Necessary headers */
@ -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

View File

@ -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>