From: evans1629 <evans1629>
Date: Sat, 7 Jun 2003 18:28:07 +0000 (+0000)
Subject: Fixed problem with russian characters.
X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/commitdiff_plain/c09ebffeb5fc8d2c644fa818f3510a6300340725

Fixed problem with russian characters.
---

diff --git a/Makefile.am b/Makefile.am
index c77eeda..04deb17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,6 @@ binaryDerivedFiles = Makefile.binary.in configure.binary
 configure.binary:configure.binary.ac
 	-autoconf -oconfigure.binary configure.binary.ac
 
-
 Makefile.binary.in:Makefile.binary.am
 	-automake Makefile.binary
 	$(SED) -e s/Makefile\.binary/Makefile/ Makefile.binary.in > tMakefile.binary.in
@@ -53,9 +52,6 @@ Makefile.binary.in:Makefile.binary.am
 #drl add this hack 3/1/2003
 #make the generated makefile depend on Makefile not Makefile.binary
 
-
-
-
 $(binaryDir)/Makefile.in: $(binaryDir)/Makefile.am
 	-automake $(binaryDir)/Makefile
 
diff --git a/Makefile.in b/Makefile.in
index 9476c78..1e0a2ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -121,10 +121,10 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	uninstall-info-recursive all-recursive install-data-recursive \
 	install-exec-recursive installdirs-recursive install-recursive \
 	uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = README Makefile.am Makefile.in acinclude.m4 aclocal.m4 \
-	config.hin config/config.guess config/config.sub config/depcomp \
-	config/install-sh config/missing config/mkinstalldirs configure \
-	configure.ac
+DIST_COMMON = README Makefile.am Makefile.in TODO acinclude.m4 \
+	aclocal.m4 config.hin config/config.guess config/config.sub \
+	config/depcomp config/install-sh config/missing \
+	config/mkinstalldirs configure configure.ac
 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/config.hin b/config.hin
index 1060d69..852e9c4 100644
--- a/config.hin
+++ b/config.hin
@@ -1,6 +1,6 @@
 /* config.hin.  Generated from configure.ac by autoheader.  */
 
-/*constmacros@*/
+/*@-constmacros@*/
 
 /* build */
 #undef BUILD
diff --git a/configure b/configure
index 2cff803..abc138d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for Splint 3.1.1.
+# Generated by GNU Autoconf 2.53 for Splint 3.1.1.1.
 #
 # Report bugs to <splint-bug@splint.org>.
 #
@@ -8,6 +8,14 @@
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -16,13 +24,11 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
 
+# NLS nuisances.
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
   as_unset=unset
@@ -30,42 +36,34 @@ else
   as_unset=false
 fi
 
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
+(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
+    { $as_unset LANG || test "${LANG+set}" != set; } ||
+      { LANG=C; export LANG; }
+(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
+    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
+      { LC_ALL=C; export LC_ALL; }
+(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
+    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
+      { LC_TIME=C; export LC_TIME; }
+(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
+    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
+      { LC_CTYPE=C; export LC_CTYPE; }
+(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
+    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
+      { LANGUAGE=C; export LANGUAGE; }
+(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
+    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
+      { LC_COLLATE=C; export LC_COLLATE; }
+(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
+    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
+      { LC_NUMERIC=C; export LC_NUMERIC; }
+(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
+    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
+      { LC_MESSAGES=C; export LC_MESSAGES; }
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`(basename "$0") 2>/dev/null ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)$' \| \
@@ -76,7 +74,6 @@ echo X/"$0" |
   	  /^X\/\(\/\).*/{ s//\1/; q; }
   	  s/.*/./; q'`
 
-
 # PATH needs CR, and LINENO needs CR and PATH.
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -87,15 +84,15 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+  echo "#! /bin/sh" >conftest.sh
+  echo  "exit 0"   >>conftest.sh
+  chmod +x conftest.sh
+  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
     PATH_SEPARATOR=';'
   else
     PATH_SEPARATOR=:
   fi
-  rm -f conf$$.sh
+  rm -f conftest.sh
 fi
 
 
@@ -143,8 +140,6 @@ do
   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
 	     CONFIG_SHELL=$as_dir/$as_base
 	     export CONFIG_SHELL
 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
@@ -217,12 +212,6 @@ else
 fi
 rm -f conf$$ conf$$.exe conf$$.file
 
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  as_mkdir_p=false
-fi
-
 as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
@@ -239,7 +228,7 @@ as_nl='
 IFS=" 	$as_nl"
 
 # CDPATH.
-$as_unset CDPATH
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
 
 
 # Name of the host.
@@ -253,7 +242,6 @@ exec 6>&1
 # Initializations.
 #
 ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
 cross_compiling=no
 subdirs=
 MFLAGS=
@@ -268,13 +256,11 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Splint'
 PACKAGE_TARNAME='splint'
-PACKAGE_VERSION='3.1.1'
-PACKAGE_STRING='Splint 3.1.1'
+PACKAGE_VERSION='3.1.1.1'
+PACKAGE_STRING='Splint 3.1.1.1'
 PACKAGE_BUGREPORT='splint-bug@splint.org'
 
 ac_unique_file="src/lclinit.c"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP LEX LEXLIB LEX_OUTPUT_ROOT LN_S BISON GREP DIFF CAT RM MV CP SED LCLOBJ LIBOBJS LTLIBOBJS'
-ac_subst_files=''
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -698,9 +684,6 @@ if test ! -r $srcdir/$ac_unique_file; then
    { (exit 1); exit 1; }; }
   fi
 fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
 srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
 ac_env_build_alias_set=${build_alias+set}
 ac_env_build_alias_value=$build_alias
@@ -742,7 +725,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Splint 3.1.1 to adapt to many kinds of systems.
+\`configure' configures Splint 3.1.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -809,7 +792,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Splint 3.1.1:";;
+     short | recursive ) echo "Configuration of Splint 3.1.1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -873,7 +856,7 @@ esac
 # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
 # absolute.
 ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
 ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
 ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
 
@@ -899,8 +882,8 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-Splint configure 3.1.1
-generated by GNU Autoconf 2.57
+Splint configure 3.1.1.1
+generated by GNU Autoconf 2.53
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 Free Software Foundation, Inc.
@@ -914,8 +897,8 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Splint $as_me 3.1.1, which was
-generated by GNU Autoconf 2.57.  Invocation command line was
+It was created by Splint $as_me 3.1.1.1, which was
+generated by GNU Autoconf 2.53.  Invocation command line was
 
   $ $0 $@
 
@@ -967,54 +950,27 @@ _ACEOF
 
 # Keep a trace of the command line.
 # Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
 # Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
 ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
 ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
+for ac_arg
 do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-        ac_must_keep_next=false # Got value, back to normal.
-      else
-        case $ac_arg in
-          *=* | --config-cache | -C | -disable-* | --disable-* \
-          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-          | -with-* | --with-* | -without-* | --without-* | --x)
-            case "$ac_configure_args0 " in
-              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-            esac
-            ;;
-          -* ) ac_must_keep_next=true ;;
-        esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
+  case $ac_arg in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n ) continue ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    continue ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  case " $ac_configure_args " in
+    *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+    *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+       ac_sep=" " ;;
+  esac
+  # Get rid of the leading space.
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -1025,7 +981,6 @@ trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
     echo
-
     cat <<\_ASBOX
 ## ---------------- ##
 ## Cache variables. ##
@@ -1048,35 +1003,6 @@ _ASBOX
     esac;
 }
     echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-        echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
     if test -s confdefs.h; then
       cat <<\_ASBOX
 ## ----------- ##
@@ -1084,7 +1010,7 @@ _ASBOX
 ## ----------- ##
 _ASBOX
       echo
-      sed "/^$/d" confdefs.h | sort
+      sed "/^$/d" confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
@@ -1248,7 +1174,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
 
 
 ac_aux_dir=
@@ -1552,15 +1477,15 @@ fi
   test -n "$AWK" && break
 done
 
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo 'ac_maketemp="${MAKE}"'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
@@ -1591,7 +1516,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=splint
- VERSION=3.1.1
+ VERSION=3.1.1.1
 
 
 # Some tools Automake needs.
@@ -1710,7 +1635,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 # Add the stamp file to the list of files AC keeps track of,
 # along with our hook.
-          ac_config_headers="$ac_config_headers config.h:config.hin"
+ac_config_headers="$ac_config_headers config.h:config.hin"
 
 
 
@@ -1926,7 +1851,9 @@ if test $ac_prog_rejected = yes; then
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+    set dummy "$as_dir/$ac_word" ${1+"$@"}
+    shift
+    ac_cv_prog_CC="$@"
   fi
 fi
 fi
@@ -2031,10 +1958,8 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
@@ -2059,12 +1984,14 @@ ac_compiler=`set X $ac_compile; echo $2`
 
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#include "confdefs.h"
 
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -2074,7 +2001,7 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
@@ -2093,39 +2020,26 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
 # Be careful to initialize this variable, since it used to be cached.
 # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
 ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-do
-  test -f "$ac_file" || continue
+for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null;
+                ls a.out conftest 2>/dev/null;
+                ls a.* conftest.* 2>/dev/null`; do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-        ;;
-    conftest.$ac_ext )
-        # This is the source file.
-        ;;
-    [ab].out )
-        # We found the default executable, but exeext='' is most
-        # certainly right.
-        break;;
-    *.* )
-        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-        # FIXME: I believe we export ac_cv_exeext for Libtool,
-        # but it would be cool to find out if it's true.  Does anybody
-        # maintain Libtool? --akim.
-        export ac_cv_exeext
-        break;;
-    * )
-        break;;
+    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;;
+    a.out ) # We found the default executable, but exeext='' is most
+            # certainly right.
+            break;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
+          export ac_cv_exeext
+          break;;
+    * ) break;;
   esac
 done
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5
+echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
@@ -2152,11 +2066,9 @@ if test "$cross_compiling" != yes; then
 	cross_compiling=yes
     else
 	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
+If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
+If you meant to cross compile, use \`--host'." >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
@@ -2164,7 +2076,7 @@ fi
 echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
@@ -2184,10 +2096,9 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
 # `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
+for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
           export ac_cv_exeext
           break;;
@@ -2195,10 +2106,8 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2216,12 +2125,14 @@ if test "${ac_cv_objext+set}" = set; then
 else
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#include "confdefs.h"
 
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -2238,19 +2149,16 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
+echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2267,12 +2175,14 @@ if test "${ac_cv_c_compiler_gnu+set}" = set; then
 else
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#include "confdefs.h"
 
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -2299,8 +2209,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+cat conftest.$ac_ext >&5
 ac_compiler_gnu=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
@@ -2320,12 +2229,14 @@ if test "${ac_cv_prog_cc_g+set}" = set; then
 else
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#include "confdefs.h"
 
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -2349,8 +2260,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+cat conftest.$ac_ext >&5
 ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
@@ -2372,102 +2282,6 @@ else
     CFLAGS=
   fi
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
 # Some people use a C++ compiler to compile C.  Since we use `exit',
 # in C++ we need to declare it.  In case someone uses the same compiler
 # for both compiling C and C++ we need to have the C++ compiler decide
@@ -2500,13 +2314,15 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 do
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -2530,19 +2346,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   :
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+cat conftest.$ac_ext >&5
 continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#include "confdefs.h"
 $ac_declaration
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -2566,8 +2383,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   break
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 done
@@ -2580,8 +2396,7 @@ fi
 
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -2600,7 +2415,7 @@ fi
 rmdir .deps 2>/dev/null
 
 
-          ac_config_commands="$ac_config_commands depfiles"
+ac_config_commands="$ac_config_commands depfiles"
 
 
 am_make=${MAKE-make}
@@ -2755,28 +2570,18 @@ for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include "confdefs.h"
+#include <assert.h>
                      Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
+  egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2793,8 +2598,7 @@ if test -z "$ac_cpp_err"; then
   :
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  cat conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
@@ -2804,17 +2608,13 @@ rm -f conftest.err conftest.$ac_ext
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
+  egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2832,8 +2632,7 @@ if test -z "$ac_cpp_err"; then
 continue
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  cat conftest.$ac_ext >&5
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -2862,28 +2661,18 @@ for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include "confdefs.h"
+#include <assert.h>
                      Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
+  egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2900,8 +2689,7 @@ if test -z "$ac_cpp_err"; then
   :
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  cat conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
@@ -2911,17 +2699,13 @@ rm -f conftest.err conftest.$ac_ext
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
+  egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2939,8 +2723,7 @@ if test -z "$ac_cpp_err"; then
 continue
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  cat conftest.$ac_ext >&5
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -2953,10 +2736,8 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -3019,11 +2800,7 @@ else
 LIBS="-lfl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -3032,6 +2809,12 @@ extern "C"
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
 char yywrap ();
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -3055,8 +2838,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_cv_lib_fl_yywrap=yes
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+cat conftest.$ac_ext >&5
 ac_cv_lib_fl_yywrap=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -3076,11 +2858,7 @@ else
 LIBS="-ll  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -3089,6 +2867,12 @@ extern "C"
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
 char yywrap ();
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -3112,8 +2896,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_cv_lib_l_yywrap=yes
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+cat conftest.$ac_ext >&5
 ac_cv_lib_l_yywrap=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -3191,8 +2974,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_cv_prog_lex_yytext_pointer=yes
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_save_LIBS
@@ -3290,15 +3072,15 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo 'ac_maketemp="${MAKE}"'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
@@ -3628,15 +3410,17 @@ echo $ECHO_N "checking whether we need _ALL_SOURCE to expose mode_t... $ECHO_C"
 all=no
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#include "confdefs.h"
 
 #include <stdio.h>
 mode_t x;
 
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -3660,24 +3444,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   :
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+cat conftest.$ac_ext >&5
 all=maybe
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 if test $all = maybe ; then
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+#include "confdefs.h"
 
 #define _ALL_SOURCE
 #include <stdio.h>
 mode_t x;
 
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -3704,8 +3489,7 @@ _ACEOF
  all=yes
 else
   echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
@@ -3798,7 +3582,7 @@ _ACEOF
 
 
 # These used to be in herald.h
-LCL_PARSE_VERSION="Splint 3.1.1"
+LCL_PARSE_VERSION="Splint 3.1.1.1"
 
 cat >>confdefs.h <<_ACEOF
 #define SPLINT_VERSION "$LCL_PARSE_VERSION --- `date +"%d %b %Y"`"
@@ -3914,7 +3698,7 @@ _ACEOF
 
 
 
-                                                                      ac_config_files="$ac_config_files Makefile imports/Makefile lib/Makefile src/Makefile test/Makefile doc/Makefile bin/Makefile"
+ac_config_files="$ac_config_files Makefile imports/Makefile lib/Makefile src/Makefile test/Makefile doc/Makefile bin/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -3926,7 +3710,7 @@ cat >confcache <<\_ACEOF
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# `ac_cv_env_foo' variables (set or unset) will be overriden when
 # loading this file, other *unset* `ac_cv_foo' will be assigned the
 # following values.
 
@@ -3961,7 +3745,7 @@ _ACEOF
      t end
      /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+if cmp -s $cache_file confcache; then :; else
   if test -w $cache_file; then
     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
     cat confcache >$cache_file
@@ -3992,21 +3776,6 @@ fi
 
 DEFS=-DHAVE_CONFIG_H
 
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -4028,12 +3797,11 @@ cat >$CONFIG_STATUS <<_ACEOF
 # configure, is in config.log if it exists.
 
 debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
+
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -4042,13 +3810,11 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
 
+# NLS nuisances.
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
   as_unset=unset
@@ -4056,42 +3822,34 @@ else
   as_unset=false
 fi
 
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
+(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
+    { $as_unset LANG || test "${LANG+set}" != set; } ||
+      { LANG=C; export LANG; }
+(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
+    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
+      { LC_ALL=C; export LC_ALL; }
+(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
+    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
+      { LC_TIME=C; export LC_TIME; }
+(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
+    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
+      { LC_CTYPE=C; export LC_CTYPE; }
+(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
+    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
+      { LANGUAGE=C; export LANGUAGE; }
+(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
+    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
+      { LC_COLLATE=C; export LC_COLLATE; }
+(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
+    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
+      { LC_NUMERIC=C; export LC_NUMERIC; }
+(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
+    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
+      { LC_MESSAGES=C; export LC_MESSAGES; }
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`(basename "$0") 2>/dev/null ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)$' \| \
@@ -4102,7 +3860,6 @@ echo X/"$0" |
   	  /^X\/\(\/\).*/{ s//\1/; q; }
   	  s/.*/./; q'`
 
-
 # PATH needs CR, and LINENO needs CR and PATH.
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -4113,15 +3870,15 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+  echo "#! /bin/sh" >conftest.sh
+  echo  "exit 0"   >>conftest.sh
+  chmod +x conftest.sh
+  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
     PATH_SEPARATOR=';'
   else
     PATH_SEPARATOR=:
   fi
-  rm -f conf$$.sh
+  rm -f conftest.sh
 fi
 
 
@@ -4170,8 +3927,6 @@ do
   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
 	     CONFIG_SHELL=$as_dir/$as_base
 	     export CONFIG_SHELL
 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
@@ -4245,12 +4000,6 @@ else
 fi
 rm -f conf$$ conf$$.exe conf$$.file
 
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  as_mkdir_p=false
-fi
-
 as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
@@ -4267,7 +4016,7 @@ as_nl='
 IFS=" 	$as_nl"
 
 # CDPATH.
-$as_unset CDPATH
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
 
 exec 6>&1
 
@@ -4283,8 +4032,8 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by Splint $as_me 3.1.1, which was
-generated by GNU Autoconf 2.57.  Invocation command line was
+This file was extended by Splint $as_me 3.1.1.1, which was
+generated by GNU Autoconf 2.53.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -4324,7 +4073,6 @@ Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
@@ -4346,8 +4094,8 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Splint config.status 3.1.1
-configured by $0, generated by GNU Autoconf 2.57,
+Splint config.status 3.1.1.1
+configured by $0, generated by GNU Autoconf 2.53,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -4368,25 +4116,25 @@ do
   --*=*)
     ac_option=`expr "x$1" : 'x\([^=]*\)='`
     ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
+    shift
+    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+    shift
     ;;
+  -*);;
   *) # This is not an option, so the user has probably given explicit
      # arguments.
-     ac_option=$1
      ac_need_defaults=false;;
   esac
 
-  case $ac_option in
+  case $1 in
   # Handling of the options.
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
+    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
   --version | --vers* | -V )
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
@@ -4401,16 +4149,13 @@ Try \`$0 --help' for more information." >&2;}
   --debug | --d* | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    shift
+    CONFIG_FILES="$CONFIG_FILES $1"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $1"
     ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
 
   # This is an error.
   -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
@@ -4425,20 +4170,6 @@ Try \`$0 --help' for more information." >&2;}
   shift
 done
 
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
 _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
@@ -4482,9 +4213,6 @@ if $ac_need_defaults; then
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
 # Create a temporary directory, and hook for its removal unless debugging.
 $debug ||
 {
@@ -4493,17 +4221,17 @@ $debug ||
 }
 
 # Create a (secure) tmp directory for tmp files.
-
+: ${TMPDIR=/tmp}
 {
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=./confstat$$-$RANDOM
+  tmp=$TMPDIR/cs$$-$RANDOM
   (umask 077 && mkdir $tmp)
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
    { (exit 1); exit 1; }
 }
 
@@ -4608,8 +4336,6 @@ s,@MV@,$MV,;t t
 s,@CP@,$CP,;t t
 s,@SED@,$SED,;t t
 s,@LCLOBJ@,$LCLOBJ,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 
 _ACEOF
@@ -4680,30 +4406,25 @@ echo X"$ac_file" |
   	  /^X\(\/\/\)$/{ s//\1/; q; }
   	  /^X\(\/\).*/{ s//\1/; q; }
   	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$as_dir" : 'X\(//\)[^/]' \| \
-         X"$as_dir" : 'X\(//\)$' \| \
-         X"$as_dir" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
+  { case "$ac_dir" in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" ||
+        mkdir "$as_incr_dir" ||
+	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }
+    ;;
+  esac
+done; }
 
   ac_builddir=.
 
@@ -4733,7 +4454,7 @@ esac
 # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
 # absolute.
 ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
 ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
 ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
 
@@ -4923,7 +4644,7 @@ _ACEOF
 # Break up conftest.defines because some shells have a limit on the size
 # of here documents, and old seds have small limits too (100 cmds).
 echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo '  if egrep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
 echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
 echo '  :' >>$CONFIG_STATUS
 rm -f conftest.tail
@@ -4947,7 +4668,7 @@ do
   mv conftest.tail conftest.defines
 done
 rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
+echo '  fi # egrep' >>$CONFIG_STATUS
 echo >>$CONFIG_STATUS
 
 # Break up conftest.undefs because some shells have a limit on the size
@@ -4987,7 +4708,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
   cat $tmp/in >>$tmp/config.h
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+    if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
@@ -5003,30 +4724,25 @@ echo X"$ac_file" |
   	  /^X\(\/\/\)$/{ s//\1/; q; }
   	  /^X\(\/\).*/{ s//\1/; q; }
   	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$as_dir" : 'X\(//\)[^/]' \| \
-         X"$as_dir" : 'X\(//\)$' \| \
-         X"$as_dir" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
+      { case "$ac_dir" in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" ||
+        mkdir "$as_incr_dir" ||
+	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }
+    ;;
+  esac
+done; }
 
       rm -f $ac_file
       mv $tmp/config.h $ac_file
@@ -5091,7 +4807,7 @@ esac
 # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
 # absolute.
 ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
 ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
 ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
 
@@ -5160,30 +4876,25 @@ echo X"$file" |
   	  /^X\(\/\/\)$/{ s//\1/; q; }
   	  /^X\(\/\).*/{ s//\1/; q; }
   	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$as_dir" : 'X\(//\)[^/]' \| \
-         X"$as_dir" : 'X\(//\)$' \| \
-         X"$as_dir" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
+    { case $dirpart/$fdir in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy=$dirpart/$fdir
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" ||
+        mkdir "$as_incr_dir" ||
+	{ { echo "$as_me:$LINENO: error: cannot create $dirpart/$fdir" >&5
+echo "$as_me: error: cannot create $dirpart/$fdir" >&2;}
+   { (exit 1); exit 1; }; }
+    ;;
+  esac
+done; }
 
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
@@ -5212,11 +4923,8 @@ ac_clean_files=$ac_clean_files_save
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  $SHELL $CONFIG_STATUS || ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
diff --git a/configure.ac b/configure.ac
index 1fec42d..80d85d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process with autoconf to create a configure script  -*- Autoconf -*-
 AC_PREREQ(2.50)
 
-AC_INIT([Splint], [3.1.1], [splint-bug@splint.org], [splint])
+AC_INIT([Splint], [3.1.1.1], [splint-bug@splint.org], [splint])
 
 dnl This MUST precede any other macro
 AC_CONFIG_AUX_DIR([config])
@@ -17,8 +17,8 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION, AC_PACKAGE_BUGREPORT)
 AM_CONFIG_HEADER([config.h:config.hin])
 
 dnl Prepare for Splint processing of config.h
-AH_TOP([/*@-constmacros@*/])
-AH_BOTTOM([/*@=constmacros@*/])
+AH_TOP([/*@ -constmacros@*/])
+AH_BOTTOM([/*@ =constmacros@*/])
 
 dnl Checks for programs.
 #drl 12-19-2001 commented out so Splint won't depend on C++
diff --git a/doc/manual.doc b/doc/manual.doc
index 0eaeb5a..aa37b38 100644
Binary files a/doc/manual.doc and b/doc/manual.doc differ
diff --git a/doc/manual.pdf b/doc/manual.pdf
index 5d14c02..67ee5f2 100755
Binary files a/doc/manual.pdf and b/doc/manual.pdf differ
diff --git a/install.html b/install.html
index 14580cc..e4ff5fe 100755
--- a/install.html
+++ b/install.html
@@ -59,7 +59,9 @@ GNU's make utility is required; it may be named
    It is best to do this in an emacs shell or a buffered terminal,
    so you can scroll through the output.
 <p>
-This builds Splint.
+This builds Splint.  While it is building, subscribe to the
+splint-announce mailing list by visiting
+http://www.splint.org/lists.html
 <p>
 If the build was successful, it then runs the test
 suite.  You should see:
@@ -69,7 +71,6 @@ Testing splint 3.1.1...
 
 Version Info:
 Splint 3.1.1 --- 11 Feb 2002
-
 Maintainer: splint-bug@splint.org
 
 <em>... (about 100 lines of test output elided)</em>
diff --git a/src/Headers/cpplib.h b/src/Headers/cpplib.h
index e00c063..bc44c01 100644
--- a/src/Headers/cpplib.h
+++ b/src/Headers/cpplib.h
@@ -402,7 +402,7 @@ extern bool cppReader_isTraditional (/*@special@*/ cppReader *p_pfile)
     /*@uses p_pfile->opts@*/
    /*@modifies nothing@*/ ; 
 
-#define cppReader_isTraditional(PFILE) (CPPOPTIONS(PFILE)-> traditional)
+#define cppReader_isTraditional(PFILE) (CPPOPTIONS(PFILE)->traditional)
 
 extern bool cppReader_isPedantic (cppReader *) /*@*/; 
 #define cppReader_isPedantic(PFILE) (CPPOPTIONS (PFILE)->pedantic)
diff --git a/src/Makefile.in b/src/Makefile.in
index 534fbe5..be75a1a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -632,7 +632,7 @@ CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@
 DIST_SOURCES = $(lcl_SOURCES) $(splint_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = Makefile.am Makefile.in TODO
 SOURCES = $(lcl_SOURCES) $(splint_SOURCES)
 
 all: $(BUILT_SOURCES)
diff --git a/src/cpplib.c b/src/cpplib.c
index 09d9d10..fbbf3ad 100644
--- a/src/cpplib.c
+++ b/src/cpplib.c
@@ -238,6 +238,10 @@ static int cpp_peekN (cppReader *p_pfile, int p_n) /*@*/ ;
 # define cppBuffer_get(BUFFER) \
   ((BUFFER)->cur < (BUFFER)->rlimit ? *(BUFFER)->cur++ : EOF)
 
+/*@function static int cppBuffer_reachedEOF (sef cppBuffer *p_b) modifies nothing; @*/
+# define cppBuffer_reachedEOF(b) \
+  ((b)->cur < (b)->rlimit ? FALSE : TRUE)
+
 /* Append string STR (of length N) to PFILE's output buffer.  Make space. */
 /*@function static void cppReader_puts (sef cppReader *p_file, char *p_str, sef size_t p_n)
                      modifies *p_file; @*/
@@ -295,6 +299,9 @@ static void cppBuffer_forward (cppBuffer *p_buf, int p_n) /*@modifies *p_buf@*/
 /*@function static int cppReader_getC (cppReader *p_pfile) modifies *p_pfile; @*/
 # define cppReader_getC(pfile)   (cppBuffer_get (cppReader_getBufferSafe (pfile)))
 
+/*@function static int cppReader_reachedEOF (sef cppReader *p_pfile) modifies *p_pfile; @*/
+# define cppReader_reachedEOF(pfile)   (cppBuffer_reachedEOF (cppReader_getBufferSafe (pfile)))
+
 /*@function static int cppReader_peekC (cppReader *) modifies nothing;@*/
 # define cppReader_peekC(pfile)  (cpplib_bufPeek (cppReader_getBufferSafe (pfile)))
 
@@ -6110,14 +6117,18 @@ get_next:
 				      &start_line, &start_column);
 	  old_written = cpplib_getWritten (pfile);
 	string:
-	  DPRINTF (("Put char: %c", c));
+	  DPRINTF (("Reading string: %c", c));
 	  cppReader_putChar (pfile, c);
 	  while (TRUE)
 	    {
-	      int cc = cppReader_getC (pfile);
-	      DPRINTF (("cc: %c", c));
-	      if (cc == EOF)
+	      /* evans-2003-06-07
+	      ** Because of ISO8859-1 characters in string literals, we need a special test here.
+	      */
+
+	      if (cppReader_reachedEOF (pfile)) 
 		{
+		  
+		  DPRINTF (("Matches EOF!"));
 		  if (cppBuffer_isMacro (CPPBUFFER (pfile)))
 		    {
 		      /* try harder: this string crosses a macro expansion
@@ -6131,13 +6142,14 @@ get_next:
 		      CPPBUFFER (pfile) = next_buf;
 		      continue;
 		    }
+		  
 		  if (!cppReader_isTraditional (pfile))
 		    {
 		      cpp_setLocation (pfile);
 
 		      setLine (long_toInt (start_line));
 		      setColumn (long_toInt (start_column));
-
+		      
 		      if (pfile->multiline_string_line != long_toInt (start_line)
 			  && pfile->multiline_string_line != 0)
 			{
@@ -6157,59 +6169,64 @@ get_next:
 			     message ("Unterminated string or character constant"));
 			}
 		    }
-		  /*@loopbreak@*/ break;
-		}
-	      DPRINTF (("putting char: %c", cc));
-	      cppReader_putChar (pfile, cc);
-	      switch (cc)
+		  /*@loopbreak@*/ break;		  
+		} 
+	      else
 		{
-		case '\n':
-		  /* Traditionally, end of line ends a string constant with
-		     no error.  So exit the loop and record the new line.  */
-		  if (cppReader_isTraditional (pfile))
-		    goto while2end;
-		  if (c == '\'')
-		    {
-		      goto while2end;
-		    }
-		  if (cppReader_isPedantic (pfile)
-		      && pfile->multiline_string_line == 0)
-		    {
-		      cppReader_pedwarnWithLine
-			(pfile, long_toInt (start_line),
-			 long_toInt (start_column),
-			 cstring_makeLiteral ("String constant runs past end of line"));
-		    }
-		  if (pfile->multiline_string_line == 0)
-		    {
-		      pfile->multiline_string_line = start_line;
-		    }
-
-		  /*@switchbreak@*/ break;
-
-		case '\\':
-		  cc = cppReader_getC (pfile);
-		  if (cc == '\n')
-		    {
-		      /* Backslash newline is replaced by nothing at all.  */
-		      cppReader_adjustWritten (pfile, -1);
-		      pfile->lineno++;
-		    }
-		  else
+		  int cc = cppReader_getC (pfile); 
+		  DPRINTF (("cc: %c [%d] [%d]", cc, cc, EOF));
+		  DPRINTF (("putting char: %c", cc));
+		  cppReader_putChar (pfile, cc);
+		  switch (cc)
 		    {
-		      /* ANSI stupidly requires that in \\ the second \
-			 is *not* prevented from combining with a newline.  */
-		      NEWLINE_FIX1(cc);
-		      if (cc != EOF)
-			cppReader_putChar (pfile, cc);
+		    case '\n':
+		      /* Traditionally, end of line ends a string constant with
+			 no error.  So exit the loop and record the new line.  */
+		      if (cppReader_isTraditional (pfile))
+			goto while2end;
+		      if (c == '\'')
+			{
+			  goto while2end;
+			}
+		      if (cppReader_isPedantic (pfile)
+			  && pfile->multiline_string_line == 0)
+			{
+			  cppReader_pedwarnWithLine
+			    (pfile, long_toInt (start_line),
+			     long_toInt (start_column),
+			     cstring_makeLiteral ("String constant runs past end of line"));
+			}
+		      if (pfile->multiline_string_line == 0)
+			{
+			  pfile->multiline_string_line = start_line;
+			}
+		      
+		      /*@switchbreak@*/ break;
+		      
+		    case '\\':
+		      cc = cppReader_getC (pfile);
+		      if (cc == '\n')
+			{
+			  /* Backslash newline is replaced by nothing at all.  */
+			  cppReader_adjustWritten (pfile, -1);
+			  pfile->lineno++;
+			}
+		      else
+			{
+			  /* ANSI stupidly requires that in \\ the second \
+			     is *not* prevented from combining with a newline.  */
+			  NEWLINE_FIX1(cc);
+			  if (cc != EOF)
+			    cppReader_putChar (pfile, cc);
+			}
+		      /*@switchbreak@*/ break;
+		      
+		    case '\"':
+		    case '\'':
+		      if (cc == c)
+			goto while2end;
+		      /*@switchbreak@*/ break;
 		    }
-		  /*@switchbreak@*/ break;
-
-		case '\"':
-		case '\'':
-		  if (cc == c)
-		    goto while2end;
-		  /*@switchbreak@*/ break;
 		}
 	    }
 	while2end:
diff --git a/src/exprNode.c b/src/exprNode.c
index a4846a0..b8a3c05 100644
--- a/src/exprNode.c
+++ b/src/exprNode.c
@@ -9888,11 +9888,11 @@ exprNode_matchLiteral (ctype expected, exprNode e)
 	    }
 	  else if (multiVal_isChar (m))
 	    {
-	      char val = multiVal_forceChar (m);	  
+	      /*signed? */ char val = multiVal_forceChar (m);	   
 	      
 	      if (ctype_isChar (expected))
 		{
-		  if (ctype_isUnsigned (expected) && ((int)val) < 0)
+		  if (ctype_isUnsigned (expected) && ((int) val) < 0)
 		    {
 		      return FALSE;
 		    }
diff --git a/src/flags.def b/src/flags.def
index a41648d..cd42428 100644
--- a/src/flags.def
+++ b/src/flags.def
@@ -1920,7 +1920,7 @@ static flaglist flags =
   },
   {
     FK_BOUNDS, FK_MEMORY, plainFlag,
-    "likely-boundsread",
+    "likelyboundsread",
     FLG_LIKELYBOUNDSREAD,
     "likely out of bounds read",
     "A memory read references memory beyond the allocated storage.",
@@ -1928,7 +1928,7 @@ static flaglist flags =
   },
   {
     FK_BOUNDS, FK_MEMORY, plainFlag,
-    "likely-boundswrite",
+    "likelyboundswrite",
     FLG_LIKELYBOUNDSWRITE,
     "likely buffer overflow from an out of bounds write",
     "A memory write may write to an address beyond the allocated buffer.",
@@ -1995,16 +1995,6 @@ static flaglist flags =
     NULL,
     0, 0
   },
-  
-  {
-    FK_BOUNDS, FK_MEMORY, plainFlag,
-    "nullterminated",
-    FLG_NULLTERMINATEDWARNING,
-    "misuse of nullterminated allocation",
-    "A user annotated non-nullterminated buffer is used/referenced as a nullterminated one.",
-    0, 0
-  },
-  
   {
     FK_BOUNDS, FK_DISPLAY, plainFlag,
     "showconstraintparens",
@@ -2127,7 +2117,7 @@ static flaglist flags =
   },
   {
     FK_MACROS, FK_CONTROL, modeFlag,
-    "macroreturn",
+    "macroret",
     FLG_MACRORETURN,
     "return statement in macro body",
     "The body of a macro declared as a function uses a return statement. "
diff --git a/src/lltok.c b/src/lltok.c
index 0ae4568..3f2c77e 100644
--- a/src/lltok.c
+++ b/src/lltok.c
@@ -204,12 +204,12 @@ lltok_unparse (lltok tok)
     case TRBRACE:    lit = "}"; break;
     case TCOMMA:     lit = ","; break;
     case TCOLON:     lit = ":"; break;
-    case TASSIGN:        lit = "="; break;
+    case TASSIGN:    lit = "="; break;
     case TLPAREN:    lit = "("; break;
     case TRPAREN:    lit = ")"; break;
     case TLSQBR:     lit = "["; break;
     case TRSQBR:     lit = "]"; break;
-    case TDOT:       lit = "->"; break;
+    case TDOT:       lit = "."; break; /* evans 2003-05-31: Fix reported by psanzani. */
     case TAMPERSAND: lit = "&"; break;
     case TEXCL:      lit = "!"; break;
     case TTILDE:     lit = "~"; break;
diff --git a/src/uentry.c b/src/uentry.c
index 831bcbf..a35ff69 100644
--- a/src/uentry.c
+++ b/src/uentry.c
@@ -3074,35 +3074,46 @@ uentry_isSpecialFunction (uentry ue)
   uentry ue = uentry_makeVariableSrefParam (idDecl_observeId (t), ct, loc, pref);
 
   DPRINTF (("Make param: %s", uentry_unparseFull (ue)));
+  DPRINTF (("Base: %s [%d]", ctype_unparse (base), ctype_isFixedArray (base)));
   uentry_reflectQualifiers (ue, idDecl_getQuals (t));
   uentry_implicitParamAnnots (ue);
 
-  /* Parameter type [][] or [x][] is invalid */
+  /* Parameter type [][] or [x][] is invalid, but [][x] is okay */
 
-  while (ctype_isFixedArray (base)) {
-    base = ctype_baseArrayPtr (base);
-  }
+  while (ctype_isFixedArray (base)) 
+    {
+      base = ctype_baseArrayPtr (base);
+    }
   
-  if (ctype_isIncompleteArray (base)) {
-    base = ctype_baseArrayPtr (base);
-
-    if (ctype_isArray (base)) {
-      if (!uentry_hasName (ue)) {
-	(void) optgenerror (FLG_INCOMPLETETYPE, 
-			    message ("Unnamed function parameter %d is incomplete type (inner array must have bounds): %s",
-				     i + 1,
-				     ctype_unparse (ct)),
-			    uentry_whereLast (ue));
-      } else {
-	(void) optgenerror (FLG_INCOMPLETETYPE, 
-			    message ("Function parameter %q is incomplete type (inner array must have bounds): %s",
-				     uentry_getName (ue),
-				     ctype_unparse (ct)),
-			    uentry_whereLast (ue));
-      }
+  DPRINTF (("Base: %s", ctype_unparse (base)));
+  
+  if (ctype_isIncompleteArray (base)) 
+    {
+      base = ctype_baseArrayPtr (base);
+      DPRINTF (("Base: %s", ctype_unparse (base)));
+      if (ctype_isArray (base))
+	{
+	  if (!uentry_hasName (ue)) 
+	    {
+	      voptgenerror 
+		(FLG_INCOMPLETETYPE, 
+		 message ("Unnamed function parameter %d is incomplete type (inner array must have bounds): %s",
+			  i + 1,
+			  ctype_unparse (ct)),
+		 uentry_whereLast (ue));
+	    } 
+	  else 
+	    {
+	      voptgenerror 
+		(FLG_INCOMPLETETYPE, 
+		 message ("Function parameter %q is incomplete type (inner array must have bounds): %s",
+			  uentry_getName (ue),
+			  ctype_unparse (ct)),
+		 uentry_whereLast (ue));
+	    }
+	}
     }
-  }
-
+  
   DPRINTF (("Param: %s", uentry_unparseFull (ue)));
   return ue;
 }
diff --git a/test/Makefile.am b/test/Makefile.am
index 4fd04a8..07acfc9 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -49,7 +49,7 @@ UNITTESTS = \
   macros macrosef merge mergenull modifies modtest moduncon \
   mongoincludes mystrncat noeffect null nullret nullassign numabstract observer oldstyle outglob outparam \
   parentype postnotnull preds prefixes printflike rc refcounts release repexpose \
-  returned sharing shifts sizesigns slovaknames \
+  returned russian sharing shifts sizesigns slovaknames \
   specclauses \
   special stack staticarray strings \
   stringliteral \
@@ -734,6 +734,11 @@ repexpose:
 returned:
 	${SPLINTR} returned.c -expect 1
 
+### russian added 2003-06-07: bug reported in pre-processing non-standard characters.
+.PHONY: russian
+russian:
+	${SPLINTR} russian.c 
+
 .PHONY: sharing
 sharing: 
 	-$(SPLINTR) sharing1.c -expect 21
diff --git a/test/Makefile.in b/test/Makefile.in
index 79e5c88..ab267a7 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -137,7 +137,7 @@ UNITTESTS = \
   macros macrosef merge mergenull modifies modtest moduncon \
   mongoincludes mystrncat noeffect null nullret nullassign numabstract observer oldstyle outglob outparam \
   parentype postnotnull preds prefixes printflike rc refcounts release repexpose \
-  returned sharing shifts sizesigns slovaknames \
+  returned russian sharing shifts sizesigns slovaknames \
   specclauses \
   special stack staticarray strings \
   stringliteral \
@@ -1537,6 +1537,11 @@ repexpose:
 returned:
 	${SPLINTR} returned.c -expect 1
 
+### russian added 2003-06-07: bug reported in pre-processing non-standard characters.
+.PHONY: russian
+russian:
+	${SPLINTR} russian.c 
+
 .PHONY: sharing
 sharing: 
 	-$(SPLINTR) sharing1.c -expect 21
diff --git a/test/help.expect b/test/help.expect
index 4fbb2dc..a2e60ac 100644
--- a/test/help.expect
+++ b/test/help.expect
@@ -270,10 +270,10 @@ Finished checking --- no code processed
    legacy                      
    lh                          
    libmacros                   
-   likely-boundsread           
-   likely-boundswrite          
    likelybool                  
    likelybounds                
+   likelyboundsread            
+   likelyboundswrite           
    limit                       
    linelen                     
    lintcomments                
@@ -299,7 +299,7 @@ Finished checking --- no code processed
    macroparams                 
    macroparens                 
    macroredef                  
-   macroreturn                 
+   macroret                    
    macrostmt                   
    macrounrecog                
    macrovarprefix              
@@ -365,7 +365,6 @@ Finished checking --- no code processed
    nullret                     
    nullstate                   
    nullterminated              
-   nullterminated              
    numabstract                 
    numabstractcast             
    numabstractindex            
diff --git a/test/russian.c b/test/russian.c
new file mode 100644
index 0000000..1fe24d7
--- /dev/null
+++ b/test/russian.c
@@ -0,0 +1,10 @@
+char *russian[] =  
+  { "",
+    "ÏîíåäåëüíèÂê",  
+    "Âòîðíèê",    
+    "ÑðåäÂà",   
+    "×åòâåðã",     
+    "Ïÿòíèöà",    
+    "Ñóááîòà",  
+    "ÂîñêðåñåíüÂå",
+  } ;
diff --git a/test/russian.expect b/test/russian.expect
new file mode 100644
index 0000000..2b06c77
--- /dev/null
+++ b/test/russian.expect
@@ -0,0 +1,2 @@
+
+Finished checking --- no warnings
diff --git a/win32/Splint/SPLINT.DSW b/win32/Splint/SPLINT.DSW
deleted file mode 100755
index 35ecad2..0000000
--- a/win32/Splint/SPLINT.DSW
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "Splint"=.\Splint.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/win32/Splint/Splint.dsp b/win32/Splint/Splint.dsp
deleted file mode 100755
index a98bee8..0000000
--- a/win32/Splint/Splint.dsp
+++ /dev/null
@@ -1,827 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Splint" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Splint - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "Splint.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Splint.mak" CFG="Splint - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Splint - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Splint - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Splint - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "\\Apollo\evans\LCLintDev\src\Headers" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj /nologo /subsystem:console /machine:I386 /out:"K:/LCLintDev/win32/splint.exe"
-
-!ELSEIF  "$(CFG)" == "Splint - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "Headers" /I "\\Apollo\evans]LCLintDev\src\Headers" /I "\\Apollo\evans\LCLintDev\src\Headers" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"K:\LCLintDev\win32\Splint.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "Splint - Win32 Release"
-# Name "Splint - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\src\abstract.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\aliasTable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\annotationInfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\annotationTable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\cgrammar.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\checking.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\clabstract.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\clause.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\clauseStack.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\constraint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\constraintExpr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\constraintExprData.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\constraintGeneration.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\constraintList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\constraintOutput.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\constraintResolve.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\constraintTerm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\context.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\cpperror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\cppexp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\cpphash.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\cpplib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\cppmain.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\cprim.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\cscanner.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\cstring.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\cstringList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\cstringSList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\cstringTable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ctype.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ctypeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\cvar.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\declaratorInvNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\declaratorNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ekind.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\enumNameList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\enumNameSList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\exprChecks.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\exprData.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\exprNode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\exprNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\exprNodeSList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\fcnNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\fileIdList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\fileLib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\fileloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\filelocList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\filelocStack.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\fileTable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\flagMarker.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\flagMarkerList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\flags.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\flagSpec.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\functionClause.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\functionClauseList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\functionConstraint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\general.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\genericTable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\globals.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\globalsClause.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\globSet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\guardSet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\idDecl.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\idDeclList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\importNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\imports.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\initDeclNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\inputStream.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\interfaceNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\intSet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lclctypes.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lclinit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lcllib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lclscan.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lclscanline.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lclsyntable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lcltokentable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\letDeclNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lh.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\llerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\llgrammar.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\llmain.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lltok.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\loopHeuristics.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lslinit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lslOpList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lslOpSet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lslparse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lsymbol.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lsymbolList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\lsymbolSet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ltoken.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ltokenList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\macrocache.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mapping.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\message.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\messageLog.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\metaStateConstraint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\metaStateConstraintList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\metaStateExpression.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\metaStateInfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\metaStateSpecifier.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\metaStateTable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\modifiesClause.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtAnnotationDecl.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtAnnotationList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtAnnotationsNode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtContextNode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtDeclarationNode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtDeclarationPiece.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtDeclarationPieces.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtDefaultsDecl.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtDefaultsDeclList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtDefaultsNode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtgrammar.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtLoseReference.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtLoseReferenceList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtMergeClause.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtMergeClauseList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtMergeItem.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtMergeNode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtreader.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtscanner.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mttok.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtTransferAction.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtTransferClause.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtTransferClauseList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\mtValuesNode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\multiVal.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\nameChecks.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\osd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\pairNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\paramNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\programNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\qtype.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\qual.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\qualList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\quantifierNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\randomNumbers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\reader.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\replaceNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scan.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\scanline.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\shift.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\signature.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\sigNodeSet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\sort.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\sortList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\sortSet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\sortSetList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\sRef.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\sRefList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\sRefSet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\sRefSetList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\sRefTable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stateClause.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stateClauseList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stateCombinationTable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stateInfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stateValue.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\stDeclNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\storeRefNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\structNames.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\symtable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\syntable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\termNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tokentable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\traitRefNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\transferChecks.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\typeIdSet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\typeNameNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uentry.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uentryList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\usymIdSet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\usymtab.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\usymtab_interface.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\valueTable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\varDeclarationNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\varKinds.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\varNodeList.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\warnClause.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ynm.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/win32/Splint/Splint.sln b/win32/Splint/Splint.sln
new file mode 100755
index 0000000..11635b6
--- /dev/null
+++ b/win32/Splint/Splint.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 7.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Splint", "Splint.vcproj", "{E57CAD42-5E8E-445E-865A-965282EFA565}"
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		ConfigName.0 = Debug
+		ConfigName.1 = Release
+		ConfigName.2 = Test
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{E57CAD42-5E8E-445E-865A-965282EFA565}.Debug.ActiveCfg = Debug|Win32
+		{E57CAD42-5E8E-445E-865A-965282EFA565}.Debug.Build.0 = Debug|Win32
+		{E57CAD42-5E8E-445E-865A-965282EFA565}.Release.ActiveCfg = Release|Win32
+		{E57CAD42-5E8E-445E-865A-965282EFA565}.Release.Build.0 = Release|Win32
+		{E57CAD42-5E8E-445E-865A-965282EFA565}.Test.ActiveCfg = Test|Win32
+		{E57CAD42-5E8E-445E-865A-965282EFA565}.Test.Build.0 = Test|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/win32/Splint/Splint.suo b/win32/Splint/Splint.suo
new file mode 100755
index 0000000..59ea289
Binary files /dev/null and b/win32/Splint/Splint.suo differ
diff --git a/win32/Splint/Splint.vcproj b/win32/Splint/Splint.vcproj
new file mode 100755
index 0000000..1f7d3a1
--- /dev/null
+++ b/win32/Splint/Splint.vcproj
@@ -0,0 +1,745 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="Splint"
+	ProjectGUID="{E57CAD42-5E8E-445E-865A-965282EFA565}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="K:\splint\src\Headers"
+				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE,HAVE_CONFIG_H"
+				StringPooling="TRUE"
+				RuntimeLibrary="4"
+				EnableFunctionLevelLinking="TRUE"
+				PrecompiledHeaderFile=".\Release/Splint.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib setargv.obj"
+				OutputFile="K:\splint\win32\splint.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				ProgramDatabaseFile=".\Release/splint.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/Splint.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="K:\splint\src\Headers"
+				PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE,HAVE_CONFIG_H"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="TRUE"
+				RuntimeLibrary="4"
+				DisableLanguageExtensions="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
+				PrecompiledHeaderFile=".\Debug/Splint.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="0"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="setargv.obj odbc32.lib odbccp32.lib"
+				ShowProgress="0"
+				OutputFile="K:\splint\win32\splint.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="FALSE"
+				ProgramDatabaseFile=".\Debug/Splint.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/Splint.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Test|Win32"
+			OutputDirectory="Test"
+			IntermediateDirectory="Test"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="K:\splint\src\Headers"
+				PreprocessorDefinitions="WIN32,_WIN32,_CONSOLE,HAVE_CONFIG_H"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="TRUE"
+				WarningLevel="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4127"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="setargv.obj"
+				OutputFile="K:\splint\win32\splint.exe"
+				GenerateDebugInformation="TRUE"
+				OptimizeForWindows98="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\src\abstract.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="Headers"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="K:\splint-dev\LCLintDev\src\Headers"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\aliasTable.c">
+			</File>
+			<File
+				RelativePath="..\..\src\annotationInfo.c">
+			</File>
+			<File
+				RelativePath="..\..\src\annotationTable.c">
+			</File>
+			<File
+				RelativePath="..\..\src\cgrammar.c">
+			</File>
+			<File
+				RelativePath="..\..\src\checking.c">
+			</File>
+			<File
+				RelativePath="..\..\src\clabstract.c">
+			</File>
+			<File
+				RelativePath="..\..\src\clause.c">
+			</File>
+			<File
+				RelativePath="..\..\src\clauseStack.c">
+			</File>
+			<File
+				RelativePath="..\..\src\constraint.c">
+			</File>
+			<File
+				RelativePath="..\..\src\constraintExpr.c">
+			</File>
+			<File
+				RelativePath="..\..\src\constraintExprData.c">
+			</File>
+			<File
+				RelativePath="..\..\src\constraintGeneration.c">
+			</File>
+			<File
+				RelativePath="..\..\src\constraintList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\constraintResolve.c">
+			</File>
+			<File
+				RelativePath="..\..\src\constraintTerm.c">
+			</File>
+			<File
+				RelativePath="..\..\src\context.c">
+			</File>
+			<File
+				RelativePath="..\..\src\cpperror.c">
+			</File>
+			<File
+				RelativePath="..\..\src\cppexp.c">
+			</File>
+			<File
+				RelativePath="..\..\src\cpphash.c">
+			</File>
+			<File
+				RelativePath="..\..\src\cpplib.c">
+			</File>
+			<File
+				RelativePath="..\..\src\cppmain.c">
+			</File>
+			<File
+				RelativePath="..\..\src\cprim.c">
+			</File>
+			<File
+				RelativePath="..\..\src\cscanner.c">
+			</File>
+			<File
+				RelativePath="..\..\src\cscannerHelp.c">
+			</File>
+			<File
+				RelativePath="..\..\src\cstring.c">
+			</File>
+			<File
+				RelativePath="..\..\src\cstringList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\cstringSList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\cstringTable.c">
+			</File>
+			<File
+				RelativePath="..\..\src\ctype.c">
+			</File>
+			<File
+				RelativePath="..\..\src\ctypeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\cvar.c">
+			</File>
+			<File
+				RelativePath="..\..\src\declaratorInvNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\declaratorNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\ekind.c">
+			</File>
+			<File
+				RelativePath="..\..\src\enumNameList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\enumNameSList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\exprChecks.c">
+			</File>
+			<File
+				RelativePath="..\..\src\exprData.c">
+			</File>
+			<File
+				RelativePath="..\..\src\exprNode.c">
+			</File>
+			<File
+				RelativePath="..\..\src\exprNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\exprNodeSList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\fcnNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\fileIdList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\fileLib.c">
+			</File>
+			<File
+				RelativePath="..\..\src\fileTable.c">
+			</File>
+			<File
+				RelativePath="..\..\src\fileloc.c">
+			</File>
+			<File
+				RelativePath="..\..\src\filelocList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\filelocStack.c">
+			</File>
+			<File
+				RelativePath="..\..\src\flagMarker.c">
+			</File>
+			<File
+				RelativePath="..\..\src\flagMarkerList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\flagSpec.c">
+			</File>
+			<File
+				RelativePath="..\..\src\flags.c">
+			</File>
+			<File
+				RelativePath="..\..\src\functionClause.c">
+			</File>
+			<File
+				RelativePath="..\..\src\functionClauseList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\functionConstraint.c">
+			</File>
+			<File
+				RelativePath="..\..\src\general.c">
+			</File>
+			<File
+				RelativePath="..\..\src\genericTable.c">
+			</File>
+			<File
+				RelativePath="..\..\src\globSet.c">
+			</File>
+			<File
+				RelativePath="..\..\src\globals.c">
+			</File>
+			<File
+				RelativePath="..\..\src\globalsClause.c">
+			</File>
+			<File
+				RelativePath="..\..\src\guardSet.c">
+			</File>
+			<File
+				RelativePath="..\..\src\help.c">
+			</File>
+			<File
+				RelativePath="..\..\src\idDecl.c">
+			</File>
+			<File
+				RelativePath="..\..\src\idDeclList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\importNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\imports.c">
+			</File>
+			<File
+				RelativePath="..\..\src\initDeclNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\inputStream.c">
+			</File>
+			<File
+				RelativePath="..\..\src\intSet.c">
+			</File>
+			<File
+				RelativePath="..\..\src\interfaceNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lclctypes.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lclinit.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lcllib.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lclscan.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lclscanline.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lclsyntable.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lcltokentable.c">
+			</File>
+			<File
+				RelativePath="..\..\src\letDeclNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lh.c">
+			</File>
+			<File
+				RelativePath="..\..\src\llerror.c">
+			</File>
+			<File
+				RelativePath="..\..\src\llgrammar.c">
+			</File>
+			<File
+				RelativePath="..\..\src\llmain.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lltok.c">
+			</File>
+			<File
+				RelativePath="..\..\src\loopHeuristics.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lslOpList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lslOpSet.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lslinit.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lslparse.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lsymbol.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lsymbolList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\lsymbolSet.c">
+			</File>
+			<File
+				RelativePath="..\..\src\ltoken.c">
+			</File>
+			<File
+				RelativePath="..\..\src\ltokenList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\macrocache.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mapping.c">
+			</File>
+			<File
+				RelativePath="..\..\src\message.c">
+			</File>
+			<File
+				RelativePath="..\..\src\messageLog.c">
+			</File>
+			<File
+				RelativePath="..\..\src\metaStateConstraint.c">
+			</File>
+			<File
+				RelativePath="..\..\src\metaStateConstraintList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\metaStateExpression.c">
+			</File>
+			<File
+				RelativePath="..\..\src\metaStateInfo.c">
+			</File>
+			<File
+				RelativePath="..\..\src\metaStateSpecifier.c">
+			</File>
+			<File
+				RelativePath="..\..\src\metaStateTable.c">
+			</File>
+			<File
+				RelativePath="..\..\src\modifiesClause.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtAnnotationDecl.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtAnnotationList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtAnnotationsNode.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtContextNode.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtDeclarationNode.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtDeclarationPiece.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtDeclarationPieces.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtDefaultsDecl.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtDefaultsDeclList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtDefaultsNode.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtLoseReference.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtLoseReferenceList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtMergeClause.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtMergeClauseList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtMergeItem.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtMergeNode.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtTransferAction.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtTransferClause.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtTransferClauseList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtValuesNode.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtgrammar.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtreader.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mtscanner.c">
+			</File>
+			<File
+				RelativePath="..\..\src\mttok.c">
+			</File>
+			<File
+				RelativePath="..\..\src\multiVal.c">
+			</File>
+			<File
+				RelativePath="..\..\src\nameChecks.c">
+			</File>
+			<File
+				RelativePath="..\..\src\osd.c">
+			</File>
+			<File
+				RelativePath="..\..\src\pairNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\paramNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\pointers.c">
+			</File>
+			<File
+				RelativePath="..\..\src\programNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\qtype.c">
+			</File>
+			<File
+				RelativePath="..\..\src\qual.c">
+			</File>
+			<File
+				RelativePath="..\..\src\qualList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\quantifierNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\randomNumbers.c">
+			</File>
+			<File
+				RelativePath="..\..\src\rcfiles.c">
+			</File>
+			<File
+				RelativePath="..\..\src\reader.c">
+			</File>
+			<File
+				RelativePath="..\..\src\replaceNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\sRef.c">
+			</File>
+			<File
+				RelativePath="..\..\src\sRefList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\sRefSet.c">
+			</File>
+			<File
+				RelativePath="..\..\src\sRefSetList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\sRefTable.c">
+			</File>
+			<File
+				RelativePath="..\..\src\scan.c">
+			</File>
+			<File
+				RelativePath="..\..\src\scanline.c">
+			</File>
+			<File
+				RelativePath="..\..\src\shift.c">
+			</File>
+			<File
+				RelativePath="..\..\src\sigNodeSet.c">
+			</File>
+			<File
+				RelativePath="..\..\src\signature.c">
+			</File>
+			<File
+				RelativePath="..\..\src\sort.c">
+			</File>
+			<File
+				RelativePath="..\..\src\sortList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\sortSet.c">
+			</File>
+			<File
+				RelativePath="..\..\src\sortSetList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\stDeclNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\stateClause.c">
+			</File>
+			<File
+				RelativePath="..\..\src\stateClauseList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\stateCombinationTable.c">
+			</File>
+			<File
+				RelativePath="..\..\src\stateInfo.c">
+			</File>
+			<File
+				RelativePath="..\..\src\stateValue.c">
+			</File>
+			<File
+				RelativePath="..\..\src\storeRefNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\structNames.c">
+			</File>
+			<File
+				RelativePath="..\..\src\symtable.c">
+			</File>
+			<File
+				RelativePath="..\..\src\syntable.c">
+			</File>
+			<File
+				RelativePath="..\..\src\termNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\tokentable.c">
+			</File>
+			<File
+				RelativePath="..\..\src\traitRefNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\transferChecks.c">
+			</File>
+			<File
+				RelativePath="..\..\src\typeIdSet.c">
+			</File>
+			<File
+				RelativePath="..\..\src\typeNameNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\uentry.c">
+			</File>
+			<File
+				RelativePath="..\..\src\uentryList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\usymIdSet.c">
+			</File>
+			<File
+				RelativePath="..\..\src\usymtab.c">
+			</File>
+			<File
+				RelativePath="..\..\src\usymtab_interface.c">
+			</File>
+			<File
+				RelativePath="..\..\src\valueTable.c">
+			</File>
+			<File
+				RelativePath="..\..\src\varDeclarationNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\varKinds.c">
+			</File>
+			<File
+				RelativePath="..\..\src\varNodeList.c">
+			</File>
+			<File
+				RelativePath="..\..\src\warnClause.c">
+			</File>
+			<File
+				RelativePath="..\..\src\ynm.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/winconfig.h b/winconfig.h
index d424d5c..2bb22b9 100644
--- a/winconfig.h
+++ b/winconfig.h
@@ -22,13 +22,13 @@
 #define LCL_COMPILE "Compiled using Microsoft Visual C++ 7.0"
 
 /* Splint's version number */
-#define LCL_PARSE_VERSION "Splint 3.1.0"
+#define LCL_PARSE_VERSION "Splint 3.1.1"
 
 /* Define to disable support LCL files */
 /* #undef NOLCL */
 
 /* Splint's version number and configure/build date */
-#define SPLINT_VERSION "Splint 3.1.0 --- 20 Apr 2003"
+#define SPLINT_VERSION "Splint 3.1.1 --- 28 Apr 2003"
 
 /* The system's main include directory */
 #define SYSTEM_LIBDIR "C:/include"