Skip to content

Commit

Permalink
Include directory in filenames for allocation failure errors
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.osgeo.org/grass/grass/trunk@62440 15284696-431f-4ddb-bdfa-cd5b030d7da7
glynnc committed Oct 28, 2014
1 parent d39cf31 commit 11efe0c
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion include/Make/Compile.make
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ linker_c = $(call linker_x,$(CC))
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))
6 changes: 3 additions & 3 deletions include/defs/gis.h
Original file line number Diff line number Diff line change
@@ -81,9 +81,9 @@ void *G_incr_void_ptr(const void *, size_t);
#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))

0 comments on commit 11efe0c

Please sign in to comment.