diff -rc ../iiop-1.1a1/any.cc ./any.cc
*** ../iiop-1.1a1/any.cc	Fri Jun 16 17:10:51 1995
--- ./any.cc	Thu Sep 28 11:26:21 1995
***************
*** 332,337 ****
--- 332,338 ----
      switch (my_kind) {
        case CORBA2::tk_struct:
        case CORBA2::tk_union:
+       case CORBA2::tk_array:
        case CORBA2::tk_alias:
        case CORBA2::tk_except:
  	return tc->traverse (value, 0,
diff -rc ../iiop-1.1a1/configure ./configure
*** ../iiop-1.1a1/configure	Thu Jul  6 17:26:25 1995
--- ./configure	Wed Oct 11 17:06:37 1995
***************
*** 1,7 ****
  #! /bin/sh
  
  # Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.2 
  # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
  #
  # This configure script is free software; the Free Software Foundation
--- 1,7 ----
  #! /bin/sh
  
  # Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.3 
  # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
  #
  # This configure script is free software; the Free Software Foundation
***************
*** 216,222 ****
      verbose=yes ;;
  
    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.2"
      exit 0 ;;
  
    -with-* | --with-*)
--- 216,222 ----
      verbose=yes ;;
  
    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.3"
      exit 0 ;;
  
    -with-* | --with-*)
***************
*** 382,389 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
--- 382,389 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
***************
*** 611,618 ****
    ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
    CXXCPP="${CXX-g++} -E"
    cat > conftest.$ac_ext <<EOF
  #line 619 "configure"
--- 611,618 ----
    ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
    CXXCPP="${CXX-g++} -E"
    cat > conftest.$ac_ext <<EOF
  #line 619 "configure"
***************
*** 633,640 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  fi
  fi
  CXXCPP="$ac_cv_prog_CXXCPP"
--- 633,640 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  fi
  fi
  CXXCPP="$ac_cv_prog_CXXCPP"
***************
*** 742,747 ****
--- 742,780 ----
    echo "$ac_t""no" 1>&6
  fi
  
+ echo $ac_n "checking for -lw""... $ac_c" 1>&6
+ if eval "test \"`echo '$''{'ac_cv_lib_w'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lw  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 753 "configure"
+ #include "confdefs.h"
+ 
+ int main() { return 0; }
+ int t() {
+ wscpy()
+ ; return 0; }
+ EOF
+ if eval $ac_link; then
+   rm -rf conftest*
+   eval "ac_cv_lib_w=yes"
+ else
+   rm -rf conftest*
+   eval "ac_cv_lib_w=no"
+ fi
+ rm -f conftest*
+ LIBS="$ac_save_LIBS"
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'w`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   LIBS="${LIBS} -lw"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
  
  for ac_hdr in widec.h
  do
***************
*** 751,757 ****
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 755 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
--- 784,790 ----
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 788 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
***************
*** 789,795 ****
    ac_cv_c_cross=yes
  else
  cat > conftest.$ac_ext <<EOF
! #line 793 "configure"
  #include "confdefs.h"
  main(){return(0);}
  EOF
--- 822,828 ----
    ac_cv_c_cross=yes
  else
  cat > conftest.$ac_ext <<EOF
! #line 826 "configure"
  #include "confdefs.h"
  main(){return(0);}
  EOF
***************
*** 810,816 ****
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 814 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
--- 843,849 ----
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 847 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
***************
*** 832,838 ****
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 836 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
--- 865,871 ----
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 869 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
***************
*** 850,856 ****
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 854 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
--- 883,889 ----
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 887 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
***************
*** 871,877 ****
    ac_cv_header_stdc=no
  else
  cat > conftest.$ac_ext <<EOF
! #line 875 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--- 904,910 ----
    ac_cv_header_stdc=no
  else
  cat > conftest.$ac_ext <<EOF
! #line 908 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
***************
*** 905,911 ****
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 909 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
--- 938,944 ----
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 942 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
***************
*** 938,944 ****
    ac_cv_c_bigendian=unknown
  # See if sys/param.h defines the BYTE_ORDER macro.
  cat > conftest.$ac_ext <<EOF
! #line 942 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/param.h>
--- 971,977 ----
    ac_cv_c_bigendian=unknown
  # See if sys/param.h defines the BYTE_ORDER macro.
  cat > conftest.$ac_ext <<EOF
! #line 975 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/param.h>
***************
*** 954,960 ****
    rm -rf conftest*
    # It does; now see whether it defined to BIG_ENDIAN or not.
  cat > conftest.$ac_ext <<EOF
! #line 958 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/param.h>
--- 987,993 ----
    rm -rf conftest*
    # It does; now see whether it defined to BIG_ENDIAN or not.
  cat > conftest.$ac_ext <<EOF
! #line 991 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/param.h>
***************
*** 983,989 ****
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 987 "configure"
  #include "confdefs.h"
  main () {
    /* Are we little or big endian?  From Harbison&Steele.  */
--- 1016,1022 ----
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1020 "configure"
  #include "confdefs.h"
  main () {
    /* Are we little or big endian?  From Harbison&Steele.  */
***************
*** 1022,1028 ****
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1026 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
--- 1055,1061 ----
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1059 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
***************
*** 1056,1062 ****
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1060 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
--- 1089,1095 ----
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1093 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
***************
*** 1090,1096 ****
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1094 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
--- 1123,1129 ----
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1127 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
***************
*** 1124,1130 ****
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1128 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
--- 1157,1163 ----
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1161 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
***************
*** 1158,1164 ****
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1162 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
--- 1191,1197 ----
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1195 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
***************
*** 1189,1196 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  echo $ac_n "checking size of bool""... $ac_c" 1>&6
  if eval "test \"`echo '$''{'ac_cv_sizeof_bool'+set}'`\" = set"; then
--- 1222,1229 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  echo $ac_n "checking size of bool""... $ac_c" 1>&6
  if eval "test \"`echo '$''{'ac_cv_sizeof_bool'+set}'`\" = set"; then
***************
*** 1200,1206 ****
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1204 "configure"
  #include "confdefs.h"
  #ifdef __cplusplus
  extern "C" void exit(int);
--- 1233,1239 ----
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
  cat > conftest.$ac_ext <<EOF
! #line 1237 "configure"
  #include "confdefs.h"
  #ifdef __cplusplus
  extern "C" void exit(int);
***************
*** 1229,1239 ****
  EOF
  
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--- 1262,1308 ----
  EOF
  
  
+ for ac_hdr in iostream.h
+ do
+ ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 1274 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=no"
+ fi
+ rm -f conftest*
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+     ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_hdr 1
+ EOF
+  
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ done
+ 
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
***************
*** 1241,1247 ****
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1245 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
--- 1310,1316 ----
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1314 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
***************
*** 1278,1284 ****
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1282 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char vprintf(); below.  */
--- 1347,1353 ----
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1351 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char vprintf(); below.  */
***************
*** 1326,1332 ****
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1330 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char _doprnt(); below.  */
--- 1395,1401 ----
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1399 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char _doprnt(); below.  */
***************
*** 1377,1383 ****
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1381 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 1446,1452 ----
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1450 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 1427,1440 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_sig_ign_broken'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1438 "configure"
  #include "confdefs.h"
  #include <signal.h>
  int main() { return 0; }
--- 1496,1509 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_sig_ign_broken'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1507 "configure"
  #include "confdefs.h"
  #include <signal.h>
  int main() { return 0; }
***************
*** 1455,1462 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  echo "$ac_t""$ac_cv_decl_sig_ign_broken" 1>&6
  if test $ac_cv_decl_sig_ign_broken = yes; then
--- 1524,1531 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  echo "$ac_t""$ac_cv_decl_sig_ign_broken" 1>&6
  if test $ac_cv_decl_sig_ign_broken = yes; then
***************
*** 1475,1482 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1544,1551 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1484,1490 ****
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in netdb.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1488 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
--- 1553,1559 ----
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in netdb.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1557 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
***************
*** 1500,1507 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
--- 1569,1576 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
***************
*** 1521,1528 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1590,1597 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1530,1536 ****
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1534 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
--- 1599,1605 ----
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1603 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
***************
*** 1546,1553 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
--- 1615,1622 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
***************
*** 1567,1574 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1636,1643 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1576,1582 ****
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1580 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
--- 1645,1651 ----
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1649 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
***************
*** 1592,1599 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
--- 1661,1668 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
***************
*** 1613,1620 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1682,1689 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1622,1628 ****
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1626 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
--- 1691,1697 ----
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1695 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
***************
*** 1638,1645 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
--- 1707,1714 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
***************
*** 1659,1666 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1728,1735 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1668,1674 ****
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1672 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
--- 1737,1743 ----
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1741 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
***************
*** 1684,1691 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
--- 1753,1760 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
***************
*** 1705,1712 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1774,1781 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1714,1720 ****
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/time.h sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1718 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
--- 1783,1789 ----
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/time.h sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1787 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
***************
*** 1730,1737 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
--- 1799,1806 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
***************
*** 1751,1758 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1820,1827 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1760,1766 ****
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1764 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
--- 1829,1835 ----
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1833 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
***************
*** 1776,1783 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
--- 1845,1852 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
***************
*** 1797,1804 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1866,1873 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1806,1812 ****
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1810 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
--- 1875,1881 ----
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1879 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
***************
*** 1822,1829 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
--- 1891,1898 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
***************
*** 1843,1850 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1912,1919 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1852,1858 ****
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1856 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
--- 1921,1927 ----
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1925 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
***************
*** 1868,1875 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
--- 1937,1944 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
***************
*** 1889,1896 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1958,1965 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1898,1904 ****
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/time.h time.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1902 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
--- 1967,1973 ----
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/time.h time.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1971 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
***************
*** 1914,1921 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
--- 1983,1990 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
***************
*** 1935,1942 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2004,2011 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1944,1950 ****
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in signal.h sys/signal.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1948 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
--- 2013,2019 ----
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in signal.h sys/signal.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 2017 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
***************
*** 1960,1967 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
--- 2029,2036 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
***************
*** 1981,1988 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2050,2057 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1990,1996 ****
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in unistd.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 1994 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
--- 2059,2065 ----
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in unistd.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 2063 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
***************
*** 2006,2013 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
--- 2075,2082 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
***************
*** 2027,2034 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2096,2103 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2036,2042 ****
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in errno.h string.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 2040 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
--- 2105,2111 ----
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in errno.h string.h; do
  	cat > conftest.$ac_ext <<EOF
! #line 2109 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
***************
*** 2052,2059 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
--- 2121,2128 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
***************
*** 2074,2081 ****
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} $CXXFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
! ac_link='${CXX-g++} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2143,2150 ----
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$''{'ac_cv_decl_$ac_safe1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2083,2089 ****
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h sys/types.h string.h ; do
  	cat > conftest.$ac_ext <<EOF
! #line 2087 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
--- 2152,2158 ----
    eval "ac_cv_decl_$ac_safe1=no"
      for ac_h_file in sys/socket.h sys/types.h string.h ; do
  	cat > conftest.$ac_ext <<EOF
! #line 2156 "configure"
  #include "confdefs.h"
  #include <$ac_h_file>
  EOF
***************
*** 2099,2106 ****
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
--- 2168,2175 ----
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
  
  if eval "test \"`echo '$ac_cv_decl_'$ac_safe1`\" = no"; then
      echo "$ac_t""no" 1>&6
***************
*** 2191,2197 ****
      echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
!     echo "$CONFIG_STATUS generated by autoconf version 2.2"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
      echo "\$ac_cs_usage"; exit 0 ;;
--- 2260,2266 ----
      echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
!     echo "$CONFIG_STATUS generated by autoconf version 2.3"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
      echo "\$ac_cs_usage"; exit 0 ;;
***************
*** 2201,2207 ****
  
  ac_given_srcdir=$srcdir
  
! trap 'rm -fr `echo Makefile orbconf.hh | tr : " "` conftest*; exit 1' 1 2 15
  
  # Protect against being on the right side of a sed subst in config.status. 
  sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; 
--- 2270,2276 ----
  
  ac_given_srcdir=$srcdir
  
! trap 'rm -fr `echo "Makefile orbconf.hh" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  
  # Protect against being on the right side of a sed subst in config.status. 
  sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; 
diff -rc ../iiop-1.1a1/configure.in ./configure.in
*** ../iiop-1.1a1/configure.in	Thu Jul  6 02:28:41 1995
--- ./configure.in	Wed Oct 11 17:06:25 1995
***************
*** 32,37 ****
--- 32,38 ----
  AC_CHECK_LIB(c_r,pthread_mutex_lock, [
      CPPFLAGS="${CPPFLAGS} -D_REENTRANT" LIBS="${LIBS} -lc_r" ])
  AC_CHECK_LIB(socket, accept, LIBS="${LIBS} -lsocket -lnsl", , -lnsl)
+ AC_CHECK_LIB(w, wscpy, LIBS="${LIBS} -lw")
  
  dnl
  dnl Checks for header files.
***************
*** 55,64 ****
--- 56,67 ----
  dnl
  dnl Must do 'sizeof(bool)' check in C++, but we seem to get problems if we
  dnl do the others in C++ (reported to bug-gnu-utils) ...
+ dnl Also need to be in C++ when checking for iostream
  dnl
  AC_LANG_SAVE
  AC_LANG_CPLUSPLUS
  AC_CHECK_SIZEOF(bool)
+ AC_CHECK_HEADERS(iostream.h)
  AC_LANG_RESTORE
  
  dnl
diff -rc ../iiop-1.1a1/echo_clnt.cc ./echo_clnt.cc
*** ../iiop-1.1a1/echo_clnt.cc	Mon Jun 12 18:32:44 1995
--- ./echo_clnt.cc	Fri Sep 22 14:13:52 1995
***************
*** 10,15 ****
--- 10,17 ----
  // is no utility in looping to change those values.
  //
  
+ #include "test1.hh"
+ 
  #ifdef	USE_IOSTREAM
  #include <iostream.h>				// not always available
  #endif
***************
*** 23,29 ****
  #	include "getopt.h"			// e.g. GNU's version
  #endif
  
- #include "test1.hh"
  #include "debug.hh"
  
  
--- 25,30 ----
***************
*** 54,64 ****
  #define	RELEASE(X)
  #define	PERFORM_TEST(name,type,value1,value2) \
      { \
! 	CORBA2::type	v1, v2, v3; \
   	\
! 	v1 = (CORBA2::type)(value1); \
  	v2 = 0; \
! 	v3 = (CORBA2::type)(value2); \
   	\
  	test_count++; \
  	if (debug_level) SHOW_INPUT_VALUES(test_count, type, v1, v3) \
--- 55,65 ----
  #define	RELEASE(X)
  #define	PERFORM_TEST(name,type,value1,value2) \
      { \
! 	CORBA2::##type	v1, v2, v3; \
   	\
! 	v1 = (CORBA2::##type)(value1); \
  	v2 = 0; \
! 	v3 = (CORBA2::##type)(value2); \
   	\
  	test_count++; \
  	if (debug_level) SHOW_INPUT_VALUES(test_count, type, v1, v3) \
***************
*** 67,75 ****
  	if (env.exception () != 0) { \
  	    print_exception (env.exception (), "perform test_" #name); \
  	    error_count++; \
! 	} else if (!COMPARE (CORBA2::type, v1, value1) \
! 		|| !COMPARE (CORBA2::type, v2, value1) \
! 		|| !COMPARE (CORBA2::type, v3, value2) ) { \
  	    DO_IO(cerr << "bad comparison, test_" #name << endl); \
  	    error_count++; \
  	} \
--- 68,76 ----
  	if (env.exception () != 0) { \
  	    print_exception (env.exception (), "perform test_" #name); \
  	    error_count++; \
! 	} else if (!COMPARE (CORBA2::##type, v1, value1) \
! 		|| !COMPARE (CORBA2::##type, v2, value1) \
! 		|| !COMPARE (CORBA2::##type, v3, value2) ) { \
  	    DO_IO(cerr << "bad comparison, test_" #name << endl); \
  	    error_count++; \
  	} \
***************
*** 134,151 ****
      //
  #define NORMAL_SHOW_INPUT(count,type,v1,v2) \
      DO_IO(cerr << "client input test " << count << " type " # type \
! 	<< ": " << v1 \ << " " << v2 << endl);
  #define NORMAL_SHOW_OUTPUT(count, type, v1, v2) \
      DO_IO(cerr << "client output test " << count << " type " # type \
! 	<< ": " << v1 \ << " " << v2 << endl);
  #define EXPVAL(type,original_value) ((type) (original_value))
  #define COMPARE(type,retval,original_value) \
      ((retval) == EXPVAL(type, original_value))
  
  #define SHOW_INPUT_VALUES(count, type, v1, v2) \
!     NORMAL_SHOW_INPUT(count, type, form("%02x", v1), form("%02x", v2))
  #define SHOW_OUTPUT_VALUES(count, type, v1, v2) \
!     NORMAL_SHOW_OUTPUT(count, type, form("%02x", v1), form("%02x", v2))
  
      PERFORM_TEST (octet, Octet, 254, 128);
  
--- 135,158 ----
      //
  #define NORMAL_SHOW_INPUT(count,type,v1,v2) \
      DO_IO(cerr << "client input test " << count << " type " # type \
! 	<< ": " << v1 << " " << v2 << endl);
  #define NORMAL_SHOW_OUTPUT(count, type, v1, v2) \
      DO_IO(cerr << "client output test " << count << " type " # type \
! 	<< ": " << v1 << " " << v2 << endl);
! 
! // Use this where values are method calls, not manipulators
! #define METHOD_SHOW(s,count,type,v1,v2) \
!   DO_IO(((cerr << "client " #s " test " << count << " type " # type \
! 	<< ": ").v1 << " " ).v2 << endl);
! 
  #define EXPVAL(type,original_value) ((type) (original_value))
  #define COMPARE(type,retval,original_value) \
      ((retval) == EXPVAL(type, original_value))
  
  #define SHOW_INPUT_VALUES(count, type, v1, v2) \
!     METHOD_SHOW(input, count, type, form("%02x", v1), form("%02x", v2))
  #define SHOW_OUTPUT_VALUES(count, type, v1, v2) \
!     METHOD_SHOW(output, count, type, form("%02x", v1), form("%02x", v2))
  
      PERFORM_TEST (octet, Octet, 254, 128);
  
***************
*** 220,229 ****
  
  #undef SHOW_INPUT_VALUES
  #define SHOW_INPUT_VALUES(count, type, v1, v2) \
!     NORMAL_SHOW_INPUT(count, type, form("%02x", v1), form("%02x", v2))
  #undef SHOW_OUTPUT_VALUES
  #define SHOW_OUTPUT_VALUES(count, type, v1, v2) \
!     NORMAL_SHOW_OUTPUT(count, type, form("%02x", v1), form("%02x", v2))
  
      PERFORM_TEST (char, Char, 26, -5);
  
--- 227,236 ----
  
  #undef SHOW_INPUT_VALUES
  #define SHOW_INPUT_VALUES(count, type, v1, v2) \
!     METHOD_SHOW(input, count, type, form("%02x", v1), form("%02x", v2))
  #undef SHOW_OUTPUT_VALUES
  #define SHOW_OUTPUT_VALUES(count, type, v1, v2) \
!     METHOD_SHOW(output, count, type, form("%02x", v1), form("%02x", v2))
  
      PERFORM_TEST (char, Char, 26, -5);
  
diff -rc ../iiop-1.1a1/echo_svr.cc ./echo_svr.cc
*** ../iiop-1.1a1/echo_svr.cc	Mon Jun 12 18:32:44 1995
--- ./echo_svr.cc	Thu Sep 14 13:21:00 1995
***************
*** 8,13 ****
--- 8,15 ----
  // messages, responds to them.
  //
  
+ #include	"test1.hh"
+ 
  #ifdef	USE_IOSTREAM
  #include	<iostream.h>
  #endif
***************
*** 21,28 ****
  #	include "getopt.h"		// e.g. GNU's version
  #endif
  
- #include	"test1.hh"
- 
  #include	"tcpoa.hh"
  #include	"debug.hh"
  
--- 23,28 ----
***************
*** 137,144 ****
      DO_IO(cerr << "server input/output type " #type << ": " \
  	<< v1 << " " << v2 << endl);
  
  #define SHOW_VALUES(type, v1, v2) \
!     NORMAL_SHOW_VALUES(type, form("%02x", v1), form("%02x", v2))
  
  DEFINE_SKEL2 (octet, Octet)
  
--- 137,149 ----
      DO_IO(cerr << "server input/output type " #type << ": " \
  	<< v1 << " " << v2 << endl);
  
+ // Use this here v1 and v2 are methods (like form) not manipulators
+ #define METHOD_SHOW_VALUES(type, v1, v2) \
+     DO_IO(((cerr << "server input/output type " #type << ": " \
+ 	).v1 << " " ).v2 << endl);
+ 
  #define SHOW_VALUES(type, v1, v2) \
!     METHOD_SHOW_VALUES(type, form("%02x", v1), form("%02x", v2))
  
  DEFINE_SKEL2 (octet, Octet)
  
***************
*** 182,188 ****
  
  #undef SHOW_VALUES
  #define SHOW_VALUES(type, v1, v2) \
!     NORMAL_SHOW_VALUES(type, form("%02x", v1), form("%02x", v2))
  
  DEFINE_SKEL2 (char, Char)
  
--- 187,193 ----
  
  #undef SHOW_VALUES
  #define SHOW_VALUES(type, v1, v2) \
!     METHOD_SHOW_VALUES(type, form("%02x", v1), form("%02x", v2))
  
  DEFINE_SKEL2 (char, Char)
  
diff -rc ../iiop-1.1a1/misc.cc ./misc.cc
*** ../iiop-1.1a1/misc.cc	Mon Jun 12 18:32:07 1995
--- ./misc.cc	Thu Sep 28 11:30:44 1995
***************
*** 185,194 ****
--- 185,200 ----
      // scope are system exceptions ... except for a couple that
      // are related to TypeCodes.
      //
+ #ifdef OLDCODE
      if (strncmp ((char *) _ex->id (), sysex_prefix,
  		sizeof sysex_prefix - 1) == 0
  	    || strncmp ((char *) _ex->id () + sizeof sysex_prefix - 1,
  		    "TypeCode/", 9) != 0)
+ #else
+     if (strncmp ((char *) _ex->id(), "IDL:omg.org/CORBA/", 10) == 0
+ 	&& strncmp ((char *) _ex->id(), "IDL:omg.org/CORBA/TypeCode/", 19) != 0
+ 	)
+ #endif
  	return SYSTEM_EXCEPTION;
  
      return USER_EXCEPTION;
diff -rc ../iiop-1.1a1/orbconf.hh.in ./orbconf.hh.in
*** ../iiop-1.1a1/orbconf.hh.in	Thu Jul  6 02:28:42 1995
--- ./orbconf.hh.in	Wed Sep 13 17:26:01 1995
***************
*** 21,26 ****
--- 21,29 ----
  /* Define if you have the <widec.h> header file.  */
  #undef HAVE_WIDEC_H
  
+ /* Define if you have the <iostream.h> header file.  */
+ #undef HAVE_IOSTREAM_H
+ 
  /* Define to `int' if <sys/types.h> doesn't define.  */
  #undef pid_t
  
***************
*** 187,192 ****
--- 190,200 ----
  
  #ifndef	HAVE_STRDUP
  #define	strdup(s)	strcpy ((char *)malloc (strlen (s) + 1), s)
+ #endif
+ 
+ // If iostream is available, enable it in the debugging
+ #ifdef HAVE_IOSTREAM_H
+ #define USE_IOSTREAM
  #endif
  
  #endif	// _ORB_CONFIG_HH
diff -rc ../iiop-1.1a1/tcpoa.cc ./tcpoa.cc
*** ../iiop-1.1a1/tcpoa.cc	Mon Jun 12 18:32:19 1995
--- ./tcpoa.cc	Thu Sep 28 11:34:34 1995
***************
*** 645,651 ****
      if (do_thr_create) {
  #ifdef	_POSIX_THREADS
  	//
! 	// Need to handle it in another thread.  That means handing off a
  	// bunch of information to that thread and then having it do the
  	// work ... the simplest alternative is to heap-allocate the data
  	// and hand it over.  That involves no handshaking with the thread
--- 645,651 ----
      if (do_thr_create) {
  #ifdef	_POSIX_THREADS
  	//
! 	// Want to handle it in another thread.  That means handing off a
  	// bunch of information to that thread and then having it do the
  	// work ... the simplest alternative is to heap-allocate the data
  	// and hand it over.  That involves no handshaking with the thread
***************
*** 668,700 ****
  
  	errcode = pthread_create (&tid, &thread_attr, worker, context);
  
! 	//
! 	// Can't deal with this as requested; report the error.
! 	//
! 	if (errcode != 0) {
! 	    dmsg2 ("pthread_create error: %d (%s)", errcode,
! 		    strerror (errcode));
! 	    env.exception (new CORBA2::NO_RESOURCES);
  	    return;
- 	}
- #endif	// _POSIX_THREADS
  
-     } else {
- 
- 	//
- 	// Handle it in this thread.  We can do it without any need
- 	// to dynamically allocate memory.
  	//
! 	dispatch_context		context;
  
! 	context.handle_request = handle_request;
! 	context.check_forward = check_forward;
! 	context.ctx = ctx;
! 	context.oa = this;
! 	context.endpoint = fd;
! 
! 	handle_message (context, env);
      }
  
      if (env.exception () != 0)
  	dexc (env, "TCP_OA, handle incoming message");
--- 668,706 ----
  
  	errcode = pthread_create (&tid, &thread_attr, worker, context);
  
! 	if (errcode == 0)
  	    return;
  
  	//
! 	// Can't create a thread as requested.  Rather than handling it
! 	// in another thread, we must then handle it ourselves.  It's bad
! 	// news to drop requests, as would happen if we were to just
! 	// report an exception.
! 	//
! 	// XXX this should be logged as some kind of system fault;
! 	// an administrator would need to deal with these failures
! 	// if they happen repatedly.
! 	//
! 	dmsg2 ("pthread_create error: %d (%s)", errcode,
! 		strerror (errcode));
! 	delete context;
  
! #endif	// _POSIX_THREADS
      }
+ 
+     //
+     // Handle it in this thread.  We can do it without any need
+     // to dynamically allocate memory.
+     //
+     dispatch_context		context;
+ 
+     context.handle_request = handle_request;
+     context.check_forward = check_forward;
+     context.ctx = ctx;
+     context.oa = this;
+     context.endpoint = fd;
+ 
+     handle_message (context, env);
  
      if (env.exception () != 0)
  	dexc (env, "TCP_OA, handle incoming message");
diff -rc ../iiop-1.1a1/test1_clnt.cc ./test1_clnt.cc
*** ../iiop-1.1a1/test1_clnt.cc	Thu Jun 22 16:49:50 1995
--- ./test1_clnt.cc	Thu Sep 14 10:00:26 1995
***************
*** 5,10 ****
--- 5,12 ----
  // TEST		client driver for "test1"
  //
  
+ #include "test1.hh"
+ 
  #ifdef	USE_IOSTREAM
  #include <iostream.h>
  #endif
***************
*** 20,26 ****
  
  #endif	// unix
  
- #include "test1.hh"
  #include "debug.hh"
  
  
--- 22,27 ----
diff -rc ../iiop-1.1a1/typecode.cc ./typecode.cc
*** ../iiop-1.1a1/typecode.cc	Wed Oct 18 14:00:40 1995
--- ./typecode.cc	Thu Sep 28 11:36:14 1995
***************
*** 1,4 ****
! // @(#)typecode.cc	2.14 95/06/29
  // Copyright 1994-1995 by Sun Microsystems Inc.
  // All Rights Reserved
  //
--- 1,4 ----
! // @(#)typecode.cc	2.15 95/07/06
  // Copyright 1994-1995 by Sun Microsystems Inc.
  // All Rights Reserved
  //
***************
*** 268,274 ****
      if (env.exception () != 0)
  	return 0;
  
!     for (int i = 0; i <= n; i++) {
      	if (CDR::decoder (tc, buf, this, &stream, env)
      	    	    	!= CORBA2::TypeCode::TRAVERSE_CONTINUE
      	    	|| !stream.skip_string ()   	    // member name
--- 268,274 ----
      if (env.exception () != 0)
  	return 0;
  
!     for (CORBA2::ULong i = 0; i <= n; i++) {
      	if (CDR::decoder (tc, buf, this, &stream, env)
      	    	    	!= CORBA2::TypeCode::TRAVERSE_CONTINUE
      	    	|| !stream.skip_string ()   	    // member name