[GRASS-SVN] r62444 - in grass/branches/releasebranch_7_0: . include/Make include/defs

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-10-28 09:03:41 -0700 (Tue, 28 Oct 2014)
New Revision: 62444

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/include/Make/Compile.make
   grass/branches/releasebranch_7_0/include/defs/gis.h
Log:
Include directory in filenames for allocation failure errors (trunk, r62440)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:61095,61098-61099,61788,61897,62141,62327,62346,62352,62354,62356,62360,62364,62415,62425,62438
   + /grass/trunk:61095,61098-61099,61788,61897,62141,62327,62346,62352,62354,62356,62360,62364,62415,62425,62438,62440

Modified: grass/branches/releasebranch_7_0/include/Make/Compile.make
===================================================================
--- grass/branches/releasebranch_7_0/include/Make/Compile.make	2014-10-28 16:00:51 UTC (rev 62443)
+++ grass/branches/releasebranch_7_0/include/Make/Compile.make	2014-10-28 16:03:41 UTC (rev 62444)
@@ -20,7 +20,7 @@
 linker_cxx = $(call linker_x,$(CXX))
 linker = $(call linker_x,$(LINK))
 
-ALL_CFLAGS = $(LFS_CFLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(DEFS) $(EXTRA_INC) $(INC)
+ALL_CFLAGS = $(LFS_CFLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(DEFS) $(EXTRA_INC) $(INC) -DRELDIR=\"$(RELDIR)\"
 
 compiler_x = $(1) $(2) $(ALL_CFLAGS) -o $@ -c $<
 compiler_c = $(call compiler_x,$(CC),$(COMPILE_FLAGS_C) $($*_c_FLAGS))

Modified: grass/branches/releasebranch_7_0/include/defs/gis.h
===================================================================
--- grass/branches/releasebranch_7_0/include/defs/gis.h	2014-10-28 16:00:51 UTC (rev 62443)
+++ grass/branches/releasebranch_7_0/include/defs/gis.h	2014-10-28 16:03:41 UTC (rev 62444)
@@ -81,9 +81,9 @@
 #endif
 
 #ifndef CTYPESGEN
-#define G_malloc(n)     G__malloc(__FILE__, __LINE__, (n))
-#define G_calloc(m, n)  G__calloc(__FILE__, __LINE__, (m), (n))
-#define G_realloc(p, n) G__realloc(__FILE__, __LINE__, (p), (n))
+#define G_malloc(n)     G__malloc(RELDIR "/" __FILE__, __LINE__, (n))
+#define G_calloc(m, n)  G__calloc(RELDIR "/" __FILE__, __LINE__, (m), (n))
+#define G_realloc(p, n) G__realloc(RELDIR "/" __FILE__, __LINE__, (p), (n))
 #else
 #define G_malloc(n)     G__malloc("<ctypesgen>", 0, (n))
 #define G_calloc(m, n)  G__calloc("<ctypesgen>", 0, (m), (n))