% diff -c ./em/EntityManager.C.~1~ ./em/EntityManager.C
*** ./em/EntityManager.C.~1~    Fri Apr 21 07:20:36 1995
--- ./em/EntityManager.C        Wed May 17 16:20:40 1995
***************
*** 44,52 ****
--- 44,54 ----
  #include <ctype.h>
  #include <stdio.h>

+ #if !defined(_IBMR2)
  extern "C" {
    void *memmove(void *, const void *, size_t);
  }
+ #endif

  class ExternalInputSource;



% diff -c ./nsgmls/nsgmls.C.~1~ ./nsgmls/nsgmls.C
*** ./nsgmls/nsgmls.C.~1~       Sat Apr 15 02:00:18 1995
--- ./nsgmls/nsgmls.C   Wed May 17 16:15:34 1995
***************
*** 61,67 ****
--- 61,71 ----
    opterr = 0;                 // no messages from getopt
    // Colon at beginning is Posix.2ism that says to return : rather than ? for
    // missing option argument.
+ #if defined(_IBMR2) && !defined(__GNUG__)
+   while ((opt = getopt(argc, (const char**)argv, ":a:c:def:gi:lm:prst:uvw:xX")) >= 0) {
+ #else
    while ((opt = getopt(argc, argv, ":a:c:def:gi:lm:prst:uvw:xX")) >= 0) {
+ #endif
      switch (opt) {
      case 'a':
        // activate link



% diff -c ./sgmlnorm/sgmlnorm.C.~1~ ./sgmlnorm/sgmlnorm.C
*** ./sgmlnorm/sgmlnorm.C.~1~   Tue Feb 21 07:39:46 1995
--- ./sgmlnorm/sgmlnorm.C       Wed May 17 17:10:15 1995
***************
*** 40,46 ****
--- 40,50 ----
    opterr = 0;                 // no messages from getopt
    // Colon at beginning is Posix.2ism that says to return : rather than ? for
    // missing option argument.
+ #if defined(_IBMR2) && !defined(__GNUG__)
+   while ((opt = getopt(argc, (const char**)argv, ":ek:wc:")) >= 0) {
+ #else
    while ((opt = getopt(argc, argv, ":ek:wc:")) >= 0) {
+ #endif
      switch (opt) {
      case 'c':
        parser.setOption(ParserEventGenerator::addCatalog, optarg);


% diff -c ./spam/spam.C.~1~ ./spam/spam.C
*** ./spam/spam.C.~1~   Sat Mar  4 11:01:46 1995
--- ./spam/spam.C       Wed May 17 17:10:23 1995
***************
*** 89,95 ****
--- 89,99 ----
    opterr = 0;                 // no messages from getopt
    // Colon at beginning is Posix.2ism that says to return : rather than ? for
    // missing option argument.
+ #if defined(_IBMR2) && !defined(__GNUG__)
+   while ((opt = getopt(argc, (const char**)argv, ":i:m:o:ehlpwc:x")) >= 0) {
+ #else
    while ((opt = getopt(argc, argv, ":i:m:o:ehlpwc:x")) >= 0) {
+ #endif
      switch (opt) {
      case 'c':
        easy.addCatalogSysid(optarg);


% diff -c ./Makefile.~1~ ./Makefile
*** ./Makefile.~1~      Fri Apr 21 12:07:14 1995
--- ./Makefile  Wed May 17 18:06:35 1995
***************
*** 3,12 ****
--- 3,15 ----

  # If you use gcc, then you must have at least version 2.6.1 and
  # you must use -fno-implicit-templates and -O.
+ CXX=xlC
  CXX=gcc -fno-implicit-templates -O
  WARN=-Wall -Wno-reorder -Wwrite-strings -Wpointer-arith -Wnested-externs -Woverloaded-virtual -Wbad-function-cast
+ WARN=
  # Executables will be *very* large if you use -g.
  DEBUG=-g
+ DEBUG=
  # Add -DHAVE_BOOL if you have the bool type.
  # Add -DANSI_CLASS_INST for ANSI style explicit class template instantiation.
  # Add -DMULTI_BYTE for multi-byte support.
***************
*** 19,25 ****
--- 22,30 ----
  XDEFINES=
  DEFINES=-DHAVE_BOOL -DANSI_CLASS_INST $(XDEFINES)
  CXXFLAGS=-ansi $(DEBUG) $(WARN)
+ CXXFLAGS=$(DEBUG) $(WARN)
  LDFLAGS=
+ CC=c89
  CC=gcc
  CFLAGS=-O $(DEBUG)
  # Missing library functions
***************
*** 29,34 ****
--- 34,40 ----
  # If you defined HAVE_SOCKET, add any libraries that are needed for sockets
  XLIBS=#-lsocket -lnsl
  LIBS=-liostream $(XLIBS)
+ LIBS=-L/usr/local/lib -liostream -lg++ $(XLIBS)
  # On SunOS 4, using libg++ 2.6, uncomment this.
  # libg++ is needed for strtoul which is used by libiostream.
  # LIBS=-liostream -lg++
***************
*** 38,44 ****
  AR=ar
  RANLIB=:
  # Uncomment this for SunOS 4.1.3
! #RANLIB=ranlib
  M4=m4
  # perl is needed if you change or add messages
  PERL=perl
--- 44,50 ----
  AR=ar
  RANLIB=:
  # Uncomment this for SunOS 4.1.3
! RANLIB=ranlib
  M4=m4
  # perl is needed if you change or add messages
  PERL=perl
***************
*** 54,63 ****
   "srcdir=$(srcdir)" "AR=$(AR)" "RANLIB=$(RANLIB)" \
   "M4=$(M4)" "PERL=$(PERL)" "LIBS=$(LIBS)" "PURIFY=$(PURIFY)" \
   "PIC_FLAG=$(PIC_FLAG)" "XPROGDIRS=$(XPROGDIRS)" "XLIBDIRS=$(XLIBDIRS)" \
!  "lib-Makefile=$(lib-Makefile)"

  TARGETS=all depend gen clean pure
! lib-Makefile=Makefile.lib
  do=all

  $(TARGETS):
--- 60,69 ----
   "srcdir=$(srcdir)" "AR=$(AR)" "RANLIB=$(RANLIB)" \
   "M4=$(M4)" "PERL=$(PERL)" "LIBS=$(LIBS)" "PURIFY=$(PURIFY)" \
   "PIC_FLAG=$(PIC_FLAG)" "XPROGDIRS=$(XPROGDIRS)" "XLIBDIRS=$(XLIBDIRS)" \
!  "libMakefile=$(libMakefile)"

  TARGETS=all depend gen clean pure
! libMakefile=Makefile.lib
  do=all

  $(TARGETS):
***************
*** 74,80 ****
        test -f $$srcdir/Makefile.dep || touch $$srcdir/Makefile.dep; \
        $(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
                -f $$srcdir/../Makefile.comm -f $$srcdir/Makefile.sub \
!               -f $$srcdir/../$(lib-Makefile) -f $$srcdir/Makefile.dep $(do)

  $(PROGDIRS): FORCE
        @if test $(srcdir) = .; \
--- 80,86 ----
        test -f $$srcdir/Makefile.dep || touch $$srcdir/Makefile.dep; \
        $(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
                -f $$srcdir/../Makefile.comm -f $$srcdir/Makefile.sub \
!               -f $$srcdir/../$(libMakefile) -f $$srcdir/Makefile.dep $(do)

  $(PROGDIRS): FORCE
        @if test $(srcdir) = .; \