Commit 02c308be authored by Matteo Quintiliani's avatar Matteo Quintiliani

Declared nmxp_mem_null_function() non inline


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@1292 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent 0297b3be
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* *
* *
*/ */
inline int nmxp_mem_null_function(); int nmxp_mem_null_function();
#else #else
......
...@@ -7,13 +7,20 @@ ...@@ -7,13 +7,20 @@
* Istituto Nazionale di Geofisica e Vulcanologia - Italy * Istituto Nazionale di Geofisica e Vulcanologia - Italy
* quintiliani@ingv.it * quintiliani@ingv.it
* *
* $Id: nmxp_memory.c,v 1.13 2009-08-17 12:37:36 mtheo Exp $ * $Id: nmxp_memory.c,v 1.14 2009-09-01 09:20:27 mtheo Exp $
* *
*/ */
#ifdef NMXP_MEM_DEBUG
#include "nmxp_memory.h" #include "nmxp_memory.h"
#ifndef NMXP_MEM_DEBUG
int nmxp_mem_null_function() {
return -1;
}
#else
#include "nmxp_log.h" #include "nmxp_log.h"
#include <stdio.h> #include <stdio.h>
...@@ -254,11 +261,5 @@ inline void nmxp_mem_free(void *ptr, char *source_file, int line) { ...@@ -254,11 +261,5 @@ inline void nmxp_mem_free(void *ptr, char *source_file, int line) {
} }
} }
#else
inline int nmxp_mem_null_function() {
return -1;
}
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment