From 40c577972b2110eb32307b4bbd767e7ec5bf917d Mon Sep 17 00:00:00 2001
From: Radim Kolar <>
Date: Wed, 23 Sep 2009 00:20:06 +0200
Subject: [PATCH] dont check variable sizes in SCons we do not use them
 anymore. It should improve compatibility with cross compiling.

---
 ChangeLog  | 5 +++++
 SConstruct | 7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6389bb0..9869fb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,11 @@ Version NEXT
 	  bb_pos in most, but not all cases. Because we indicate size of
 	  extra data to be received, this extended error handling is
 	  compatible with "plain FSP over serial" standard.
+	Code portability improved. Now we dont need to check sizes of
+	  predefined types because we are now using ISO C types. Only thing
+	  what we need to know is if largefiles are supported or not.
+	  If SCons cant run test program for sizing off_t for any reason,
+	  it defaults to 4 (no largefiles, 32-bit system).
 
 Version 2.8.1b25 - 10 Sep 2009
 	GNU autotools build system was entirely replaced by SCons
diff --git a/SConstruct b/SConstruct
index c2fd47f..8098d04 100644
--- a/SConstruct
+++ b/SConstruct
@@ -50,7 +50,6 @@ from maintainer import checkForMaintainerMode
 from compilertest import checkForCCOption
 from prefix import checkForUserPrefix
 from lockprefix import checkForLockPrefix
-from clangtest import getVariableSize
 from locktype import checkForLockingType
 from lamerpack import checkForLamerpack
 from debugmode import checkForDebugBuild
@@ -68,7 +67,6 @@ conf = Configure(env,{'checkForCCOption':checkForCCOption,
                       'MAINTAINER_MODE':checkForMaintainerMode,
 		      'checkForLockPrefix':checkForLockPrefix,
 		      'checkPrefix':checkForUserPrefix,
-		      'sizeOf':getVariableSize,
 		      'checkForLockingType':checkForLockingType,
 		      'checkForLamerPack':checkForLamerpack,
 		      'checkForDebugBuild':checkForDebugBuild,
@@ -121,11 +119,6 @@ if conf.CheckCHeader('sys/wait.h'):
     conf.env.Append(CPPFLAGS = '-DHAVE_SYS_WAIT_H')
 if conf.CheckCHeader('utime.h'):
     conf.env.Append(CPPFLAGS = '-DHAVE_UTIME_H')
-env.Append(CPPFLAGS = '-DSIZEOF_CHAR='+conf.sizeOf("char"))
-env.Append(CPPFLAGS = '-DSIZEOF_LONG='+conf.sizeOf("long"))
-env.Append(CPPFLAGS = '-DSIZEOF_SHORT='+conf.sizeOf("short"))
-env.Append(CPPFLAGS = '-DSIZEOF_UNSIGNED='+conf.sizeOf("unsigned"))
-env.Append(CPPFLAGS = '-DSIZEOF_VOID='+conf.sizeOf("void"))
 if not conf.CheckType("union semun", "#include <sys/types.h>\n#include <sys/ipc.h>\n#include <sys/sem.h>",'c'):
        conf.env.Append(CPPFLAGS = "-D_SEM_SEMUN_UNDEFINED=1")
 enableLargeFiles(conf)