Changeset 113 for trunk

Timestamp:

1999-01-15T16:05:51+13:00 (25 years ago)

Author:

rjmcnab

Message:

Renamed lib/heap to be lib/mgheap (it was causing some problems with
some versions of the STL libraries which contained a heap.h)

Location:

trunk/gsdl/packages/mg-1.3d

Files:

• lib/Makefile.in (modified) (3 diffs)
• lib/WIN32.MAK (modified) (3 diffs)
• lib/heap.c (deleted)
• lib/heap.h (deleted)
• lib/mgheap.c (added)
• lib/mgheap.h (added)
• src/text/mg_compression_dict.c (modified) (2 diffs)
• src/text/mg_text_estimate.c (modified) (2 diffs)

trunk/gsdl/packages/mg-1.3d/lib/Makefile.in

@@ -78 +78 @@
     bitio_m_random.h   filestats.h        local_strings.h    lovinstem.h \
     bitio_m_stdio.h    getopt.h           memlib.h \
-    bitio_gen.h        bitio_mem.h        heap.h             messages.h \
+    bitio_gen.h        bitio_mem.h        mgheap.h             messages.h \
     bitio_m.h          bitio_mems.h       huffman.h          timing.h \
     bitio_m_mem.h      bitio_random.h     huffman_mem.h      perf_hash.h \
@@ -88 +88 @@
 
 SOURCES = \
-    bitio_random.c    heap.c            memlib.c \
+    bitio_random.c    mgheap.c            memlib.c \
     bitio_stdio.c     huffman.c         messages.c \
     bitio_gen.c       filestats.c       huffman_mem.c     perf_hash.c \
@@ -100 +100 @@
 
 OBJECTS = @ALLOCA@ @LIBOBJS@ \
-    bitio_random$o    heap$o            memlib$o \
+    bitio_random$o    mgheap$o            memlib$o \
     bitio_stdio$o     huffman$o         messages$o \
     bitio_gen$o       filestats$o       huffman_mem$o     perf_hash$o \

trunk/gsdl/packages/mg-1.3d/lib/WIN32.MAK

@@ -49 +49 @@
     bitio_m_random.h   filestats.h        local_strings.h    lovinstem.h \
     bitio_m_stdio.h    getopt.h           memlib.h \
-    bitio_gen.h        bitio_mem.h        heap.h             messages.h \
+    bitio_gen.h        bitio_mem.h        mgheap.h             messages.h \
     bitio_m.h          bitio_mems.h       huffman.h          timing.h \
     bitio_m_mem.h      bitio_random.h     huffman_mem.h      perf_hash.h \
@@ -57 +57 @@
 
 SOURCES = \
-    bitio_random.c    heap.c            memlib.c \
+    bitio_random.c    mgheap.c            memlib.c \
     bitio_stdio.c     huffman.c         messages.c \
     bitio_gen.c       filestats.c       huffman_mem.c     perf_hash.c \
@@ -68 +68 @@
 
 OBJECTS =   rx$o \
-    bitio_random$o    heap$o            memlib$o \
+    bitio_random$o    mgheap$o            memlib$o \
     bitio_stdio$o     huffman$o         messages$o \
     bitio_gen$o       filestats$o       huffman_mem$o     perf_hash$o \

trunk/gsdl/packages/mg-1.3d/src/text/mg_compression_dict.c

@@ -31 +31 @@
 #include "bitio_m_stdio.h"
 #include "timing.h"
-#include "heap.h"
+#include "mgheap.h"
 #include "netorder.h"  /* [RPAP - Jan 97: Endian Ordering] */
 
@@ -45 +45 @@
 /*
    $Log$
+   Revision 1.4  1999/01/15 03:05:51  rjmcnab
+
+   Renamed lib/heap to be lib/mgheap (it was causing some problems with
+   some versions of the STL libraries which contained a heap.h)
+
    Revision 1.3  1998/12/17 09:12:52  rjmcnab
 

trunk/gsdl/packages/mg-1.3d/src/text/mg_text_estimate.c

@@ -31 +31 @@
 #include "bitio_m_stdio.h"
 #include "timing.h"
-#include "heap.h"
+#include "mgheap.h"
 #include "netorder.h"  /* [RPAP - Jan 97: Endian Ordering] */
 
@@ -49 +49 @@
 /*
    $Log$
+   Revision 1.4  1999/01/15 03:05:51  rjmcnab
+
+   Renamed lib/heap to be lib/mgheap (it was causing some problems with
+   some versions of the STL libraries which contained a heap.h)
+
    Revision 1.3  1998/12/17 09:12:53  rjmcnab