diff -crb libg++-2.5.2/libg++/src/complex.h g:libg++-2.5.2/libg++/src/complex.h
*** libg++-2.5.2/libg++/src/complex.h	Sat Apr 18 00:51:04 1992
--- g:libg++-2.5.2/libg++/src/complex.h	Wed Dec 15 04:05:22 1993
***************
*** 1,6 ****
  #ifndef _complex_h
  #define _complex_h
  #define __ATT_complex__
! #include <Complex.h>
  typedef class Complex complex;
  #endif
--- 1,6 ----
  #ifndef _complex_h
  #define _complex_h
  #define __ATT_complex__
! #include <Complx.h>
  typedef class Complex complex;
  #endif
diff -crb libg++-2.5.2/libg++/src/Complx.cc g:libg++-2.5.2/libg++/src/Complx.cc
*** libg++-2.5.2/libg++/src/Complx.cc	Wed Jun 02 00:17:26 1993
--- g:libg++-2.5.2/libg++/src/Complx.cc	Wed Dec 15 04:04:20 1993
***************
*** 1,4 ****
! /* 
  Copyright (C) 1988 Free Software Foundation
      written by Doug Lea (dl@rocky.oswego.edu)
  
--- 1,4 ----
! /* Changed for emx by Eberhard Mattes -- Dec 1993
  Copyright (C) 1988 Free Software Foundation
      written by Doug Lea (dl@rocky.oswego.edu)
  
***************
*** 18,24 ****
  #ifdef __GNUG__
  #pragma implementation
  #endif
! #include <Complex.h>
  #include <std.h>
  #include <builtin.h>
  
--- 18,24 ----
  #ifdef __GNUG__
  #pragma implementation
  #endif
! #include <Complx.h>
  #include <std.h>
  #include <builtin.h>
  
diff -crb libg++-2.5.2/libg++/src/Regx.cc g:libg++-2.5.2/libg++/src/Regx.cc
*** libg++-2.5.2/libg++/src/Regx.cc	Thu Jul 29 01:23:32 1993
--- g:libg++-2.5.2/libg++/src/Regx.cc	Sun Dec 12 20:42:38 1993
***************
*** 1,4 ****
! /* 
  Copyright (C) 1988 Free Software Foundation
      written by Doug Lea (dl@rocky.oswego.edu)
  
--- 1,4 ----
! /* Changed for emx by Eberhard Mattes -- Dec 1993
  Copyright (C) 1988 Free Software Foundation
      written by Doug Lea (dl@rocky.oswego.edu)
  
***************
*** 31,37 ****
  #include <regex.h>
  }
  
! #include <Regex.h>
  
  Regex::~Regex()
  {
--- 31,37 ----
  #include <regex.h>
  }
  
! #include <Regx.h>
  
  Regex::~Regex()
  {
diff -crb libg++-2.5.2/libg++/src/strclass.h g:libg++-2.5.2/libg++/src/strclass.h
*** libg++-2.5.2/libg++/src/strclass.h	Sat Apr 18 00:51:26 1992
--- g:libg++-2.5.2/libg++/src/strclass.h	Sun Dec 12 20:42:38 1993
***************
*** 1,5 ****
  #ifndef _strclass_h
  #define _strclass_h
! #include <String.h>
  typedef class String string;
  #endif
--- 1,6 ----
+ /* Changed for emx by Eberhard Mattes -- Dec 1993 */
  #ifndef _strclass_h
  #define _strclass_h
! #include <Strng.h>
  typedef class String string;
  #endif
diff -crb libg++-2.5.2/libg++/src/Strng.cc g:libg++-2.5.2/libg++/src/Strng.cc
*** libg++-2.5.2/libg++/src/Strng.cc	Wed Jun 02 00:18:00 1993
--- g:libg++-2.5.2/libg++/src/Strng.cc	Sun Dec 12 20:42:38 1993
***************
*** 1,4 ****
! /* 
  Copyright (C) 1988 Free Software Foundation
      written by Doug Lea (dl@rocky.oswego.edu)
  
--- 1,4 ----
! /* Changed for emx by Eberhard Mattes -- Dec 1993
  Copyright (C) 1988 Free Software Foundation
      written by Doug Lea (dl@rocky.oswego.edu)
  
***************
*** 22,28 ****
  #ifdef __GNUG__
  #pragma implementation
  #endif
! #include <String.h>
  #include <std.h>
  #include <ctype.h>
  #include <limits.h>
--- 22,28 ----
  #ifdef __GNUG__
  #pragma implementation
  #endif
! #include <Strng.h>
  #include <std.h>
  #include <ctype.h>
  #include <limits.h>
diff -crb libg++-2.5.2/libg++/src/Strng.h g:libg++-2.5.2/libg++/src/Strng.h
*** libg++-2.5.2/libg++/src/Strng.h	Tue Dec 22 23:07:54 1992
--- g:libg++-2.5.2/libg++/src/Strng.h	Sun Dec 12 20:42:40 1993
***************
*** 1,5 ****
  // This may look like C code, but it is really -*- C++ -*-
! /* 
  Copyright (C) 1988 Free Software Foundation
      written by Doug Lea (dl@rocky.oswego.edu)
  
--- 1,5 ----
  // This may look like C code, but it is really -*- C++ -*-
! /* Changed for emx by Eberhard Mattes -- Dec 1993
  Copyright (C) 1988 Free Software Foundation
      written by Doug Lea (dl@rocky.oswego.edu)
  
***************
*** 24,30 ****
  #define _String_h 1
  
  #include <iostream.h>
! #include <Regex.h>
  
  struct StrRep                     // internal String representations
  {
--- 24,30 ----
  #define _String_h 1
  
  #include <iostream.h>
! #include <Regx.h>
  
  struct StrRep                     // internal String representations
  {
diff -crb libg++-2.5.2/libio/gen-params g:libg++-2.5.2/libio/gen-params
*** libg++-2.5.2/libio/gen-params	Wed Dec 15 04:25:28 1993
--- g:libg++-2.5.2/libio/gen-params	Sun Dec 12 20:42:40 1993
***************
*** 49,60 ****
  rootdir=`pwd`/..
  gccdir=${gccdir-${rootdir}/gcc}
  binutilsdir=${binutilsdir-${rootdir}/binutils}
! CC=${CC-`if [ -f ${gccdir}/xgcc ] ; \
! 	then echo ${gccdir}/xgcc -B${gccdir}/ -I${gccdir}/include ; \
! 	else echo cc ; fi`}
! CXX=${CXX-`if [ -f ${gccdir}/xgcc ] ; \
! 	then echo ${gccdir}/xgcc -B${gccdir}/ -I${gccdir}/include ; \
! 	else echo gcc ; fi`}
  CPP=${CPP-`echo ${CC} -E`}
  CONFIG_NM=${CONFIG_NM-`if [ -f ${binutilsdir}/nm ] ; \
  	then echo ${binutilsdir}/nm ; \
--- 49,56 ----
  rootdir=`pwd`/..
  gccdir=${gccdir-${rootdir}/gcc}
  binutilsdir=${binutilsdir-${rootdir}/binutils}
! CC=gcc
! CXX='gcc -x c++'
  CPP=${CPP-`echo ${CC} -E`}
  CONFIG_NM=${CONFIG_NM-`if [ -f ${binutilsdir}/nm ] ; \
  	then echo ${binutilsdir}/nm ; \