diff -cr libg++-2.8.1.1a/libg++/src/Makefile \emx\gnu\libg++-2.8.1.1a/libg++/src/Makefile
*** libg++-2.8.1.1a/libg++/src/Makefile	Sat Oct 31 16:22:26 1998
--- \emx\gnu\libg++-2.8.1.1a/libg++/src/Makefile	Sat Oct 31 16:09:06 1998
***************
*** 97,102 ****
--- 97,105 ----
  	else true ; \
  	fi
  
+ 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.8.1.1a/libg++/src/Regx.cc \emx\gnu\libg++-2.8.1.1a/libg++/src/Regx.cc
*** libg++-2.8.1.1a/libg++/src/Regx.cc	Sun Nov 24 10:16:52 1996
--- \emx\gnu\libg++-2.8.1.1a/libg++/src/Regx.cc	Sat Oct 31 16:09:58 1998
***************
*** 1,4 ****
! /* 
  Copyright (C) 1988 Free Software Foundation
      written by Doug Lea (dl@rocky.oswego.edu)
  
--- 1,4 ----
! /* Changed for emx by Eberhard Mattes -- Oct 1998
  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.8.1.1a/libg++/src/strclass.h \emx\gnu\libg++-2.8.1.1a/libg++/src/strclass.h
*** libg++-2.8.1.1a/libg++/src/strclass.h	Sat Mar 11 20:42:36 1995
--- \emx\gnu\libg++-2.8.1.1a/libg++/src/strclass.h	Sat Oct 31 16:10:30 1998
***************
*** 1,5 ****
  #ifndef _strclass_h
  #define _strclass_h
! #include <String.h>
  typedef class String string;
  #endif
--- 1,6 ----
+ /* Changed for emx by Eberhard Mattes -- Oct 1998 */
  #ifndef _strclass_h
  #define _strclass_h
! #include <Strng.h>
  typedef class String string;
  #endif
diff -cr libg++-2.8.1.1a/libg++/src/Strng.cc \emx\gnu\libg++-2.8.1.1a/libg++/src/Strng.cc
*** libg++-2.8.1.1a/libg++/src/Strng.cc	Sun Nov 24 10:16:52 1996
--- \emx\gnu\libg++-2.8.1.1a/libg++/src/Strng.cc	Sat Oct 31 16:10:56 1998
***************
*** 1,4 ****
! /* 
  Copyright (C) 1988 Free Software Foundation
      written by Doug Lea (dl@rocky.oswego.edu)
  
--- 1,4 ----
! /* Changed for emx by Eberhard Mattes -- Oct 1998
  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.8.1.1a/libg++/src/Strng.h \emx\gnu\libg++-2.8.1.1a/libg++/src/Strng.h
*** libg++-2.8.1.1a/libg++/src/Strng.h	Sat Jun 24 17:45:38 1995
--- \emx\gnu\libg++-2.8.1.1a/libg++/src/Strng.h	Sat Oct 31 16:11:26 1998
***************
*** 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 -- Oct 1998
  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
  
