From f5a6c1e6dcea3b47c45a3fe18a3966739650f593 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 3 Nov 2010 17:40:12 +0100 Subject: [PATCH] replace/wscript: do the size checks directly after the type checks metze --- lib/replace/wscript | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript index ce177536775..3e983c769c3 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -91,6 +91,10 @@ def configure(conf): conf.CHECK_TYPE('volatile int', define='HAVE_VOLATILE') conf.CHECK_TYPE('uint_t', 'unsigned int') + conf.CHECK_SIZEOF('bool char int "long long" long short size_t ssize_t') + conf.CHECK_SIZEOF('void*', define='SIZEOF_VOID_P') + conf.CHECK_SIZEOF('off_t dev_t ino_t time_t') + conf.CHECK_TYPES('socklen_t', headers='sys/socket.h') conf.CHECK_TYPE_IN('struct ifaddrs', 'ifaddrs.h') conf.CHECK_TYPE_IN('struct addrinfo', 'netdb.h') @@ -219,10 +223,6 @@ def configure(conf): conf.CHECK_DECLS('environ getgrent_r getpwent_r', reverse=True, headers='pwd.h grp.h') conf.CHECK_DECLS('pread pwrite setenv setresgid setresuid', reverse=True) - conf.CHECK_SIZEOF('char int "long long" long off_t short size_t ssize_t') - conf.CHECK_SIZEOF('dev_t ino_t time_t') - conf.CHECK_SIZEOF('void*', define='SIZEOF_VOID_P') - if conf.CONFIG_SET('HAVE_EPOLL_CREATE') and conf.CONFIG_SET('HAVE_SYS_EPOLL_H'): conf.DEFINE('HAVE_EPOLL', 1)