diff -cr libg++-2.7.0/libg++/src/Complx.cc \emx\gnu\libg++-2.7.0/libg++/src/Complx.cc
*** libg++-2.7.0/libg++/src/Complx.cc	Fri Jun 16 22:43:08 1995
--- /emx/gnu/libg++-2.7.0/libg++/src/Complx.cc	Sat Jul 08 16:40:12 1995
***************
*** 1,4 ****
! /* 
  Copyright (C) 1988 Free Software Foundation
      written by Doug Lea (dl@rocky.oswego.edu)
  
--- 1,4 ----
! /* Changed for emx by Eberhard Mattes -- Jul 1995
  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 -cr libg++-2.7.0/libg++/src/Makefile \emx\gnu\libg++-2.7.0/libg++/src/Makefile
*** libg++-2.7.0/libg++/src/Makefile	Mon Jul 10 04:36:48 1995
--- /emx/gnu/libg++-2.7.0/libg++/src/Makefile	Sat Jul 08 17:57:12 1995
***************
*** 92,97 ****
--- 92,100 ----
  		chmod a-x,a+r $(gxx_includedir)/$$FILE ; \
  	done
  
+ rx.o: ../../librx/rx.c
+ 	$(CC) -c $(CFLAGS) $(CINCLUDES) ../../librx/rx.c
+ 
  stamp-picdir:
  	if [ -n "$(PICFLAG)" ] && [ ! -d pic ]; then \
  	  mkdir pic; \
diff -cr libg++-2.7.0/libg++/src/Regx.cc \emx\gnu\libg++-2.7.0/libg++/src/Regx.cc
*** libg++-2.7.0/libg++/src/Regx.cc	Fri Jun 16 22:44:20 1995
--- /emx/gnu/libg++-2.7.0/libg++/src/Regx.cc	Sat Jul 08 16:40:14 1995
***************
*** 1,4 ****
! /* 
  Copyright (C) 1988 Free Software Foundation
      written by Doug Lea (dl@rocky.oswego.edu)
  
--- 1,4 ----
! /* Changed for emx by Eberhard Mattes -- Jul 1995
  Copyright (C) 1988 Free Software Foundation
      written by Doug Lea (dl@rocky.oswego.edu)
  
***************
*** 35,41 ****
  #endif
  }
  
! #include <Regex.h>
  
  Regex::~Regex()
  {
--- 35,41 ----
  #endif
  }
  
! #include <Regx.h>
  
  Regex::~Regex()
  {
diff -cr libg++-2.7.0/libg++/src/strclass.h \emx\gnu\libg++-2.7.0/libg++/src/strclass.h
*** libg++-2.7.0/libg++/src/strclass.h	Sat Apr 18 00:51:26 1992
--- /emx/gnu/libg++-2.7.0/libg++/src/strclass.h	Sat Jul 08 16:40:14 1995
***************
*** 1,5 ****
  #ifndef _strclass_h
  #define _strclass_h
! #include <String.h>
  typedef class String string;
  #endif
--- 1,6 ----
+ /* Changed for emx by Eberhard Mattes -- Jul 1995 */
  #ifndef _strclass_h
  #define _strclass_h
! #include <Strng.h>
  typedef class String string;
  #endif
diff -cr libg++-2.7.0/libg++/src/Strng.cc \emx\gnu\libg++-2.7.0/libg++/src/Strng.cc
*** libg++-2.7.0/libg++/src/Strng.cc	Fri Jun 16 22:44:34 1995
--- /emx/gnu/libg++-2.7.0/libg++/src/Strng.cc	Sat Jul 08 16:40:14 1995
***************
*** 1,4 ****
! /* 
  Copyright (C) 1988 Free Software Foundation
      written by Doug Lea (dl@rocky.oswego.edu)
  
--- 1,4 ----
! /* Changed for emx by Eberhard Mattes -- Jul 1995
  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 -cr libg++-2.7.0/libg++/src/Strng.h \emx\gnu\libg++-2.7.0/libg++/src/Strng.h
*** libg++-2.7.0/libg++/src/Strng.h	Fri Jun 16 22:44:36 1995
--- /emx/gnu/libg++-2.7.0/libg++/src/Strng.h	Sat Jul 08 16:40:14 1995
***************
*** 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 -- Jul 1995
  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>
  
  #undef OK
  
--- 24,30 ----
  #define _String_h 1
  
  #include <iostream.h>
! #include <Regx.h>
  
  #undef OK
  
diff -cr libg++-2.7.0/libio/filebuf.cc \emx\gnu\libg++-2.7.0/libio/filebuf.cc
*** libg++-2.7.0/libio/filebuf.cc	Fri Jun 16 04:40:58 1995
--- /emx/gnu/libg++-2.7.0/libio/filebuf.cc	Mon Jul 10 04:22:32 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* This is part of libio/iostream, providing -*- C++ -*- input/output.
+    Changed for emx by Eberhard Mattes -- Jul 1995
  Copyright (C) 1993, 1995 Free Software Foundation
  
  This file is part of the GNU IO Library.  This library is free
***************
*** 101,106 ****
--- 102,109 ----
      posix_mode |= O_CREAT;
    if (mode & (int)ios::noreplace)
      posix_mode |= O_EXCL;
+   if (mode & (int)ios::bin)
+     posix_mode |= O_BINARY;
    int fd = ::open(filename, posix_mode, prot);
    if (fd < 0)
      return NULL;
diff -cr libg++-2.7.0/libio/fileops.c \emx\gnu\libg++-2.7.0/libio/fileops.c
*** libg++-2.7.0/libio/fileops.c	Fri Jun 16 04:41:00 1995
--- /emx/gnu/libg++-2.7.0/libio/fileops.c	Mon Jul 10 04:21:50 1995
***************
*** 1,4 ****
! /* 
  Copyright (C) 1993, 1995 Free Software Foundation
  
  This file is part of the GNU IO Library.  This library is free
--- 1,4 ----
! /* Changed for emx by Eberhard Mattes -- Jul 1995
  Copyright (C) 1993, 1995 Free Software Foundation
  
  This file is part of the GNU IO Library.  This library is free
***************
*** 170,175 ****
--- 170,179 ----
      omode = O_RDWR;
      read_write &= _IO_IS_APPENDING;
    }
+ #ifdef __EMX__
+   if (mode[0] == 'b' || (mode[0] == '+' && mode[1] == 'b'))
+     oflags |= O_BINARY;
+ #endif /* __EMX__ */
    fdesc = open(filename, omode|oflags, oprot);
    if (fdesc < 0)
      return NULL;
diff -cr libg++-2.7.0/libio/gen-params \emx\gnu\libg++-2.7.0/libio/gen-params
*** libg++-2.7.0/libio/gen-params	Mon Jul 10 04:36:50 1995
--- /emx/gnu/libg++-2.7.0/libio/gen-params	Sun Jul 09 14:30:06 1995
***************
*** 49,64 ****
  rootdir=`pwd`/..
  gccdir=${gccdir-${rootdir}/gcc}
  binutilsdir=${binutilsdir-${rootdir}/binutils}
! CC=${CC-`if [ -f ${gccdir}/xgcc ] ; \
! 	then echo ${gccdir}/xgcc -B${gccdir}/ ; \
! 	else echo cc ; fi`}
! CXX=${CXX-`if [ -f ${gccdir}/xgcc ] ; \
! 	then echo ${gccdir}/xgcc -B${gccdir}/ ; \
! 	else echo gcc ; fi`}
  CPP=${CPP-`echo ${CC} -E`}
! CONFIG_NM=${CONFIG_NM-`if [ -f ${binutilsdir}/nm.new ] ; \
! 	then echo ${binutilsdir}/nm.new ; \
! 	else echo nm ; fi`}
  
  cat <<!EOF!
  /* AUTOMATICALLY GENERATED; DO NOT EDIT! */ 
--- 49,58 ----
  rootdir=`pwd`/..
  gccdir=${gccdir-${rootdir}/gcc}
  binutilsdir=${binutilsdir-${rootdir}/binutils}
! CC=gcc
! CXX='gcc -x c++'
  CPP=${CPP-`echo ${CC} -E`}
! CONFIG_NM='nm -d'
  
  cat <<!EOF!
  /* AUTOMATICALLY GENERATED; DO NOT EDIT! */ 
diff -cr libg++-2.7.0/libio/streambuf.h \emx\gnu\libg++-2.7.0/libio/streambuf.h
*** libg++-2.7.0/libio/streambuf.h	Fri Jun 16 04:42:44 1995
--- /emx/gnu/libg++-2.7.0/libio/streambuf.h	Mon Jul 10 04:25:24 1995
***************
*** 1,4 ****
--- 1,5 ----
  /* This is part of libio/iostream, providing -*- C++ -*- input/output.
+    Changed for emx by Eberhard Mattes -- Jul 1995
  Copyright (C) 1993 Free Software Foundation
  
  This file is part of the GNU IO Library.  This library is free
***************
*** 133,138 ****
--- 134,142 ----
  	trunc = _IO_TRUNC,
  	nocreate = _IO_NOCREATE,
  	noreplace = _IO_NOREPLACE,
+ #ifdef __EMX__
+ 	binary = _IOS_BIN,
+ #endif /* __EMX__ */
  	bin = _IOS_BIN };
      enum seek_dir { beg, cur, end};
      // ANSI: typedef enum seek_dir seekdir; etc
