Merge branch 'baagaard/feature-journal-func'

* baagaard/feature-journal-func: Fix preprocessor code for detecting name of function.
geodynamics · Nov 30, 2016 · 5a1873d · 5a1873d
2 parents 99e969a + 1a29106
commit 5a1873d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/journal/macros.h b/journal/macros.h
@@ -21,7 +21,16 @@
  * __HERE__ has to be a preprocessor macro
  */
 
-#if defined(HAVE__FUNC__)
+#undef __FUNCTION__
+#if defined(__FUNCTION_NAME__)
+#define __FUNCTION__ __FUNCTION_NAME__
+#else
+#if defined(__func__)
+#define __FUNCTION__ __func__
+#endif
+#endif
+
+#if defined(__FUNCTION__)
 #define __HERE__ __FILE__,__LINE__,__FUNCTION__
 #define __HERE_ARGS__ filename, lineno, funcname
 #define __HERE_DECL__ const char * filename, long lineno, const char * funcname

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 setup(
 
     name = 'pythia', 
-    version = '0.8.1.17',
+    version = '0.8.1.18',
 
     scripts = ['bin/idd.py', 'bin/ipad.py', 'bin/journald.py'],