Index: omalloc/Makefile.in
===================================================================
--- omalloc/Makefile.in	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/Makefile.in	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -4,5 +4,5 @@
 ### Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
 ### Created: 11/99
-### Version: $Id: Makefile.in,v 1.5 2000-09-18 09:12:13 obachman Exp $
+### Version: $Id: Makefile.in,v 1.6 2000-12-12 15:26:14 obachman Exp $
 #################################################################
 
@@ -77,5 +77,5 @@
 
 HEADERS= 							\
-omAlloc.h              omList.h		      omDerivedConfig.h \
+om_Alloc.h              omList.h	      omDerivedConfig.h \
 omAllocDecl.h          omConfig.h             omMemOps.h	\
 omDebug.h              omOpts.h		      omInlineDecl.h    \
@@ -129,5 +129,5 @@
 
 omalloc.h: $(HEADERS) 
-	$(PERL) makeheader.pl -a omAlloc.h $@
+	$(PERL) makeheader.pl -a om_Alloc.h $@
 
 omalloc.o: omalloc.c
@@ -149,5 +149,5 @@
 # targets to generate omExternalConfig.[c,h]
 #
-omAlloc.h: omMalloc.h
+om_Alloc.h: omMalloc.h
 
 ifdef OM_MALLOC_SOURCE
Index: omalloc/omAlloc.c
===================================================================
--- omalloc/omAlloc.c	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/omAlloc.c	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -4,10 +4,10 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omAlloc.c,v 1.10 2000-10-27 15:28:49 obachman Exp $
+ *  Version: $Id: omAlloc.c,v 1.11 2000-12-12 15:26:14 obachman Exp $
  *******************************************************************/
 #ifndef OM_ALLOC_C
 #define OM_ALLOC_C
 
-#include "omAlloc.h"
+#include "om_Alloc.h"
 /*******************************************************************
  *  
Index: alloc/omAlloc.h
===================================================================
--- omalloc/omAlloc.h	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ 	(revision )
@@ -1,43 +1,0 @@
-/*******************************************************************
- *  File:    omAlloc.h
- *  Purpose: declaration of public routines for omalloc  
- *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
- *  Created: 11/99
- *  Version: $Id: omAlloc.h,v 1.7 2000-08-24 13:51:23 obachman Exp $
- *******************************************************************/
-#ifndef OM_ALLOC_H
-#define OM_ALLOC_H
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "omConfig.h"
-#include "omDerivedConfig.h"
-#include "omError.h"
-#include "omStructs.h"
-#include "omAllocDecl.h"
-#include "omInlineDecl.h"
-#include "omBin.h"
-#include "omMemOps.h"
-#include "omList.h"
-#include "omFindExec.h"
-#include "omGetBackTrace.h"
-#include "omRet2Info.h"
-#include "omStats.h"
-#include "omOpts.h"
-#include "omBinPage.h"
-#include "omAllocSystem.h"
-#include "omTables.h"
-#include "omAllocPrivate.h"
-#include "omDebug.h"
-#include "omInline.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OM_ALLOC_H */
Index: omalloc/omAllocSystem.c
===================================================================
--- omalloc/omAllocSystem.c	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/omAllocSystem.c	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -4,5 +4,5 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omAllocSystem.c,v 1.6 2000-11-06 11:21:16 pohl Exp $
+ *  Version: $Id: omAllocSystem.c,v 1.7 2000-12-12 15:26:15 obachman Exp $
  *******************************************************************/
 #ifndef OM_ALLOC_SYSTEM_C
@@ -18,5 +18,5 @@
 #include "omDefaultConfig.h"
 #include "omMalloc.h"
-#include "omAlloc.h"
+#include "om_Alloc.h"
 /* include after omMalloc.h */
 #include <string.h>
Index: omalloc/omBin.c
===================================================================
--- omalloc/omBin.c	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/omBin.c	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -4,8 +4,8 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omBin.c,v 1.5 2000-10-27 15:28:50 obachman Exp $
+ *  Version: $Id: omBin.c,v 1.6 2000-12-12 15:26:15 obachman Exp $
  *******************************************************************/
 
-#include "omAlloc.h"
+#include "om_Alloc.h"
 /* this should go away */
 
Index: omalloc/omBinPage.c
===================================================================
--- omalloc/omBinPage.c	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/omBinPage.c	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -4,8 +4,8 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omBinPage.c,v 1.5 2000-10-27 15:28:50 obachman Exp $
+ *  Version: $Id: omBinPage.c,v 1.6 2000-12-12 15:26:16 obachman Exp $
  *******************************************************************/
 #include <limits.h>
-#include "omAlloc.h"
+#include "om_Alloc.h"
 #include "omDefaultConfig.h"
 
Index: omalloc/omDebug.c
===================================================================
--- omalloc/omDebug.c	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/omDebug.c	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -4,10 +4,10 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 7/00
- *  Version: $Id: omDebug.c,v 1.12 2000-10-04 13:12:29 obachman Exp $
+ *  Version: $Id: omDebug.c,v 1.13 2000-12-12 15:26:16 obachman Exp $
  *******************************************************************/
 #include <limits.h>
 #include <string.h>
 #include "omConfig.h"
-#include "omAlloc.h"
+#include "om_Alloc.h"
 #include "omDebug.h"
 #include "omReturn.h"
Index: omalloc/omDebugCheck.c
===================================================================
--- omalloc/omDebugCheck.c	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/omDebugCheck.c	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -4,10 +4,10 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omDebugCheck.c,v 1.10 2000-10-27 15:28:51 obachman Exp $
+ *  Version: $Id: omDebugCheck.c,v 1.11 2000-12-12 15:26:16 obachman Exp $
  *******************************************************************/
 #include <limits.h>
 #include <stdarg.h>
 
-#include "omAlloc.h"
+#include "om_Alloc.h"
 #include "omDebug.h"
 
Index: omalloc/omDebugTrack.c
===================================================================
--- omalloc/omDebugTrack.c	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/omDebugTrack.c	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -4,5 +4,5 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omDebugTrack.c,v 1.11 2000-10-04 13:12:30 obachman Exp $
+ *  Version: $Id: omDebugTrack.c,v 1.12 2000-12-12 15:26:17 obachman Exp $
  *******************************************************************/
 #include <limits.h>
@@ -13,5 +13,5 @@
 #ifdef OM_HAVE_TRACK
 #include "omDefaultConfig.h"
-#include "omAlloc.h"
+#include "om_Alloc.h"
 
 /*******************************************************************
@@ -726,5 +726,5 @@
 
 #ifndef OM_HAVE_TRACK
-#include "omAlloc.h"
+#include "om_Alloc.h"
 #endif
 
Index: omalloc/omError.c
===================================================================
--- omalloc/omError.c	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/omError.c	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -4,9 +4,9 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omError.c,v 1.7 2000-10-04 13:12:30 obachman Exp $
+ *  Version: $Id: omError.c,v 1.8 2000-12-12 15:26:17 obachman Exp $
  *******************************************************************/
 
 #include <stdarg.h>
-#include "omAlloc.h"
+#include "om_Alloc.h"
 
 omError_t om_ErrorStatus = omError_NoError;
Index: omalloc/omList.c
===================================================================
--- omalloc/omList.c	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/omList.c	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -4,5 +4,5 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omList.c,v 1.6 2000-10-04 13:12:31 obachman Exp $
+ *  Version: $Id: omList.c,v 1.7 2000-12-12 15:26:17 obachman Exp $
  *******************************************************************/
 #include "omConfig.h"
@@ -172,5 +172,5 @@
 
 #ifndef OM_NDEBUG
-#include "omAlloc.h"
+#include "om_Alloc.h"
 #include "omDebug.h"
 
Index: omalloc/omOpts.c
===================================================================
--- omalloc/omOpts.c	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/omOpts.c	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -4,8 +4,8 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omOpts.c,v 1.5 2000-09-25 12:27:43 obachman Exp $
+ *  Version: $Id: omOpts.c,v 1.6 2000-12-12 15:26:17 obachman Exp $
  *******************************************************************/
 
-#include "omAlloc.h"
+#include "om_Alloc.h"
 #include "omDefaultConfig.h"
 
Index: omalloc/omRet2Info.c
===================================================================
--- omalloc/omRet2Info.c	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/omRet2Info.c	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -4,5 +4,5 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omRet2Info.c,v 1.10 2000-11-03 15:47:25 obachman Exp $
+ *  Version: $Id: omRet2Info.c,v 1.11 2000-12-12 15:26:18 obachman Exp $
  *******************************************************************/
 #include <stdio.h>
@@ -43,4 +43,5 @@
   }
 }
+
 
 int omBackTrace_2_RetInfo(void** bt, omRetInfo info, int max)
@@ -75,4 +76,5 @@
       i++;
     }
+    fflush(stdin);
     pipe = popen(command, "r");
     if (pipe != NULL)
Index: omalloc/omStats.c
===================================================================
--- omalloc/omStats.c	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/omStats.c	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -4,5 +4,5 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omStats.c,v 1.5 2000-11-06 11:21:17 pohl Exp $
+ *  Version: $Id: omStats.c,v 1.6 2000-12-12 15:26:18 obachman Exp $
  *******************************************************************/
 #include <unistd.h>
@@ -11,5 +11,5 @@
 #include "omDefaultConfig.h"
 #include "omMalloc.h"
-#include "omAlloc.h"
+#include "om_Alloc.h"
 
 omInfo_t om_Info = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
Index: omalloc/om_Alloc.h
===================================================================
--- omalloc/om_Alloc.h	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
+++ omalloc/om_Alloc.h	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -0,0 +1,43 @@
+/*******************************************************************
+ *  File:    om_Alloc.h
+ *  Purpose: declaration of public routines for omalloc  
+ *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
+ *  Created: 11/99
+ *  Version: $Id: om_Alloc.h,v 1.1 2000-12-12 15:26:18 obachman Exp $
+ *******************************************************************/
+#ifndef OM_ALLOC_H
+#define OM_ALLOC_H
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "omConfig.h"
+#include "omDerivedConfig.h"
+#include "omError.h"
+#include "omStructs.h"
+#include "omAllocDecl.h"
+#include "omInlineDecl.h"
+#include "omBin.h"
+#include "omMemOps.h"
+#include "omList.h"
+#include "omFindExec.h"
+#include "omGetBackTrace.h"
+#include "omRet2Info.h"
+#include "omStats.h"
+#include "omOpts.h"
+#include "omBinPage.h"
+#include "omAllocSystem.h"
+#include "omTables.h"
+#include "omAllocPrivate.h"
+#include "omDebug.h"
+#include "omInline.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OM_ALLOC_H */
Index: omalloc/omtTest.c
===================================================================
--- omalloc/omtTest.c	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/omtTest.c	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -5,5 +5,5 @@
 #endif
 
-#include "omAlloc.h"
+#include "om_Alloc.h"
 
 omMemCell_t cells[MAX_CELLS];
Index: omalloc/omtTestError.c
===================================================================
--- omalloc/omtTestError.c	(revision 185af8e39f0d1bd89bd02a81b0b156f1d7453611)
+++ omalloc/omtTestError.c	(revision 2c72eb986386d08c4cad3c7641468921a9faf348)
@@ -1,5 +1,5 @@
 #include "omtTest.h"
 #define OM_CHECK 1
-#include "omAlloc.h"
+#include "om_Alloc.h"
 
 struct LongSpec
