Convert from using env['PLATFORM'] directly to using the more flexible...

sdch/SConscript

 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import re
 
 Import('env')
 
 env = env.Clone(OPEN_VCDIFF_DIR='open-vcdiff')
 
 cpppath = [
     '$OPEN_VCDIFF_DIR/src',
 ]
 
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
   cpppath.append('$OPEN_VCDIFF_DIR/vsprojects')
 
 env.Prepend(CPPPATH = cpppath)
 
 input_files = [
     '$OPEN_VCDIFF_DIR/src/addrcache.cc',
     '$OPEN_VCDIFF_DIR/src/adler32.c',
     '$OPEN_VCDIFF_DIR/src/blockhash.cc',
     '$OPEN_VCDIFF_DIR/src/codetable.cc',
     '$OPEN_VCDIFF_DIR/src/decodetable.cc',
     '$OPEN_VCDIFF_DIR/src/encodetable.cc',
     '$OPEN_VCDIFF_DIR/src/headerparser.cc',
     '$OPEN_VCDIFF_DIR/src/logging.cc',
     '$OPEN_VCDIFF_DIR/src/varint_bigendian.cc',
     '$OPEN_VCDIFF_DIR/src/vcdecoder.cc',
     '$OPEN_VCDIFF_DIR/src/vcdiffengine.cc',
 ]
 
 env.ChromeStaticLibrary('sdch', input_files)
 
-if env['PLATFORM'] in ('posix', 'darwin'):
+if env.Bit('posix'):
 
   # Generate a target config.h file from a source config.h.in file.
   #
   # The list of defines has been taken empirically from Autoconf
   # (./configure) runs on Mac OS X and Ubuntu Hardy.
 
   defines = [
       'HAVE_DLFCN_H',
       'HAVE_FNMATCH_H',
       'HAVE_GETOPT_H',
@@ skipping 19 matching lines @@
       ('PACKAGE', '"open-vcdiff"'),
       ('PACKAGE_BUGREPORT', '"opensource@google.com"'),
       ('PACKAGE_NAME', '"open-vcdiff"'),
       ('PACKAGE_STRING', '"open-vcdiff 0.1"'),
       ('PACKAGE_TARNAME', '"open-vcdiff"'),
       ('PACKAGE_VERSION', '"0.1"'),
       ('VERSION', '"0.1"'),
       'STDC_HEADERS',
   ]
 
-  if env['PLATFORM'] == 'posix':
+  if env.Bit('linux'):
     defines.extend([
         'HAVE_MALLOC_H',
         'HAVE_MEMALIGN',
         'HAVE_POSIX_MEMALIGN',
     ])
 
-  if env['PLATFORM'] == 'darwin':
+  if env.Bit('mac'):
     defines.extend([
         'HAVE_WORKING_KQUEUE',
     ])
 
   def AutoConfig(target, source, env):
     """
     Action to generate a config.h file from an Autotools config.h.in file,
     given the list of definitions in the DEFINES construction variable.
 
     Each entry in DEFINES is either a string, in which case it
@@ skipping 19 matching lines @@
 
     header = '/* src/config.h.  Generated by SCons.  */\n'
     open(str(target[0]), 'w').write(header + contents)
 
   # varlist['DEFINES'] below makes the target config.h file depend
   # on the list of definitions in the passed-in $DEFINES variable.
   env.Command('$OPEN_VCDIFF_DIR/src/config.h',
               '$OPEN_VCDIFF_DIR/src/config.h.in',
               Action(AutoConfig, varlist=['DEFINES']),
               DEFINES=defines)