bugfix um den Linker zu beruhigen

[[Imported from SVN: r7488]]

gm/mgheapmgr.c

@@ -32,6 +32,7 @@
 #include "heaps.h"
 #include "gm.h"
 #include "algebra.h"
+#include "mgheapmgr.h"
 
 #ifdef __cplusplus
 #ifdef __TWODIM__
@@ -66,8 +67,8 @@ using namespace UG3d;
 /*																			*/
 /****************************************************************************/
 
-INT usefreelistmemory = 1;
-INT freelist_end_mark = 0;
+INT NS_PREFIX usefreelistmemory = 1;
+INT NS_PREFIX freelist_end_mark = 0;
 
 /****************************************************************************/
 /*																			*/

low/heaps.c

@@ -40,6 +40,22 @@
 #include "general.h"
 #include "debug.h"
 #include "ugdevices.h"
+#include "domain.h"
+
+#if defined(DYNAMIC_MEMORY_ALLOCMODEL) && defined(Debug)
+#include "gm.h"
+#include "commands.h"
+#include "mgheapmgr.h"
+NS_PREFIX MULTIGRID * NS_PREFIX GetCurrentMultigrid (void);
+#endif
+
+#ifdef __cplusplus
+#ifdef __TWODIM__
+using namespace UG2d;
+#else
+using namespace UG3d;
+#endif
+#endif
 
 /****************************************************************************/
 /*                                                                          */
@@ -292,13 +308,6 @@ HEAP *NewHeap (INT type, MEM size, void *buffer)
    D*/
 /****************************************************************************/
 
-#if defined(DYNAMIC_MEMORY_ALLOCMODEL) && defined(Debug)
-extern INT usefreelistmemory;
-#include "gm.h"
-#include "commands.h"
-NS_PREFIX MULTIGRID *GetCurrentMultigrid (void);
-#endif
-
 void *GetMem (HEAP *theHeap, MEM n, INT mode)
 {
   BLOCK *theBlock,*newBlock;
@@ -634,13 +643,6 @@ void DisposeMem (HEAP *theHeap, void *buffer)
    D*/
 /****************************************************************************/
 
-#if defined(DYNAMIC_MEMORY_ALLOCMODEL) && defined(Debug)
-extern INT usefreelistmemory;
-#include "gm.h"
-#include "commands.h"
-NS_PREFIX MULTIGRID *GetCurrentMultigrid (void);
-#endif
-
 void *GetFreelistMemory (HEAP *theHeap, INT size)
 {
   void **ptr, *obj;