Changeset 3f5086 in git

Timestamp:

Sep 30, 2010, 8:51:47 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

84dda10e7c43a6aa968e529b71d68fa020e56a79

Parents:

49a64cf3866667ef2b1dca559f7d269fbccd0965

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2010-09-30 20:51:47+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:31+01:00

Message:

Fixing omalloc usage in release version

Location:

reporter

Files:

• dError.c (modified) (1 diff)
• reporter.cc (modified) (2 diffs)

reporter/dError.c

@@ -33 +33 @@
   fprintf(stderr, "\n// ***dError: ");
   vfprintf(stderr, fmt, ap);
-#if 0
-    if !defined(OM_NDEBUG) && defined(HAVE_CONFIG_H)
-#endif
-#if  defined(HAVE_CONFIG_H)
+#if (!defined(NDEBUG)) && (!defined(OM_NDEBUG)) && defined(HAVE_CONFIG_H)
   fprintf(stderr, " occured at: \n");
   omPrintCurrentBackTraceMax(stderr, 8);

reporter/reporter.cc

@@ -22 +22 @@
 
 #include "reporter.h"
-#include "omalloc.h"
+#include <omalloc.h>
 //#include "options.h"
 
@@ -63 +63 @@
     feBuffer=(char *)omReallocSize((void *)feBuffer,feBufferLength,
                                                      more);
+#if (!defined(NDEBUG)) && (!defined(OM_NDEBUG)) && defined(HAVE_CONFIG_H)
     omMarkAsStaticAddr(feBuffer);
+#endif
     feBufferLength=more;
     s=feBuffer+l;