[GRASS-SVN] r63862 - grass/trunk/include/defs

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-29 11:41:46 -0800 (Mon, 29 Dec 2014)
New Revision: 63862

Modified:
   grass/trunk/include/defs/gis.h
Log:
fix gis.h to r63853


Modified: grass/trunk/include/defs/gis.h
===================================================================
--- grass/trunk/include/defs/gis.h	2014-12-29 19:38:46 UTC (rev 63861)
+++ grass/trunk/include/defs/gis.h	2014-12-29 19:41:46 UTC (rev 63862)
@@ -51,11 +51,11 @@
 #   include <alloca.h>
 #  endif
 # endif
-# define G__alloca(n) alloca(n)
-# define G__freea(p)
+# define G_alloca(n) alloca(n)
+# define G_freea(p)
 #else
-# define G__alloca(n) G_malloc(n)
-# define G__freea(p) G_free(p)
+# define G_alloca(n) G_malloc(n)
+# define G_freea(p) G_free(p)
 #endif
 
 #include <stdarg.h>
@@ -412,7 +412,7 @@
 /* ls.c */
 void G_set_ls_filter(int (*)(const char *, void *), void *);
 void G_set_ls_exclude_filter(int (*)(const char *, void *), void *);
-char **G__ls(const char *, int *);
+char **G_ls2(const char *, int *);
 void G_ls(const char *, FILE *);
 void G_ls_format(char **, int, int, FILE *);