[GRASS-SVN] r65195 - grass/trunk/lib/gis
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue May 5 03:36:02 PDT 2015
Author: martinl
Date: 2015-05-05 03:36:01 -0700 (Tue, 05 May 2015)
New Revision: 65195
Removed:
grass/trunk/lib/gis/local_proto.h
Modified:
grass/trunk/lib/gis/error.c
grass/trunk/lib/gis/get_window.c
grass/trunk/lib/gis/gis_local_proto.h
grass/trunk/lib/gis/gisinit.c
grass/trunk/lib/gis/home.c
grass/trunk/lib/gis/mapset_nme.c
grass/trunk/lib/gis/open.c
grass/trunk/lib/gis/open_misc.c
grass/trunk/lib/gis/put_window.c
grass/trunk/lib/gis/rd_cellhd.c
grass/trunk/lib/gis/set_window.c
grass/trunk/lib/gis/tempfile.c
Log:
libgis: merge local_proto.h with gis_local_proto.h
Modified: grass/trunk/lib/gis/error.c
===================================================================
--- grass/trunk/lib/gis/error.c 2015-05-05 08:30:59 UTC (rev 65194)
+++ grass/trunk/lib/gis/error.c 2015-05-05 10:36:01 UTC (rev 65195)
@@ -22,7 +22,7 @@
#include <grass/glocale.h>
#include <grass/gis.h>
-#include "local_proto.h"
+#include "gis_local_proto.h"
/*!
* \def MSG
Modified: grass/trunk/lib/gis/get_window.c
===================================================================
--- grass/trunk/lib/gis/get_window.c 2015-05-05 08:30:59 UTC (rev 65194)
+++ grass/trunk/lib/gis/get_window.c 2015-05-05 10:36:01 UTC (rev 65195)
@@ -17,7 +17,7 @@
#include <grass/glocale.h>
#include "G.h"
-#include "local_proto.h"
+#include "gis_local_proto.h"
static struct state {
int initialized;
Modified: grass/trunk/lib/gis/gis_local_proto.h
===================================================================
--- grass/trunk/lib/gis/gis_local_proto.h 2015-05-05 08:30:59 UTC (rev 65194)
+++ grass/trunk/lib/gis/gis_local_proto.h 2015-05-05 10:36:01 UTC (rev 65195)
@@ -2,13 +2,34 @@
#define __GIS_LOCAL_PROTO_H__
/* subroutines used only by GIS Library */
-/* TODO: move other G__*() subroutines here */
+/* env.c */
+void G__read_env(void);
+void G__write_env(void);
+
+/* gisinit.c */
+void G__check_gisinit(void);
+
+/* handler.c */
+void G__call_error_handlers(void);
+
+/* home.c */
+const char *G__home(void);
+
/* location.c */
char *G__location_path(void);
+/* mach_name.c */
+const char *G__machine_name(void);
+
/* mapset.c */
const char *G__mapset(void);
char *G__mapset_path(void);
+/* mapset_nme.c */
+void G__get_list_of_mapsets(void);
+
+/* timestamp.c */
+int G__read_timestamp(FILE *, struct TimeStamp *);
+
#endif
Modified: grass/trunk/lib/gis/gisinit.c
===================================================================
--- grass/trunk/lib/gis/gisinit.c 2015-05-05 08:30:59 UTC (rev 65194)
+++ grass/trunk/lib/gis/gisinit.c 2015-05-05 10:36:01 UTC (rev 65195)
@@ -24,7 +24,7 @@
#include <grass/glocale.h>
#include "G.h"
-#include "local_proto.h"
+#include "gis_local_proto.h"
struct G__ G__;
Modified: grass/trunk/lib/gis/home.c
===================================================================
--- grass/trunk/lib/gis/home.c 2015-05-05 08:30:59 UTC (rev 65194)
+++ grass/trunk/lib/gis/home.c 2015-05-05 10:36:01 UTC (rev 65195)
@@ -16,7 +16,7 @@
#include <grass/gis.h>
#include <grass/glocale.h>
-#include "local_proto.h"
+#include "gis_local_proto.h"
/*!
* \brief Get user's home directory
Deleted: grass/trunk/lib/gis/local_proto.h
===================================================================
--- grass/trunk/lib/gis/local_proto.h 2015-05-05 08:30:59 UTC (rev 65194)
+++ grass/trunk/lib/gis/local_proto.h 2015-05-05 10:36:01 UTC (rev 65195)
@@ -1,26 +0,0 @@
-#ifndef __LOCAL_PROTO_H__
-#define __LOCAL_PROTO_H__
-
-/* env.c */
-void G__read_env(void);
-void G__write_env(void);
-
-/* gisinit.c */
-void G__check_gisinit(void);
-
-/* handler.c */
-void G__call_error_handlers(void);
-
-/* home.c */
-const char *G__home(void);
-
-/* mach_name.c */
-const char *G__machine_name(void);
-
-/* mapset_nme.c */
-void G__get_list_of_mapsets(void);
-
-/* timestamp.c */
-int G__read_timestamp(FILE *, struct TimeStamp *);
-
-#endif /* LOCAL_PROTO_H__ */
Modified: grass/trunk/lib/gis/mapset_nme.c
===================================================================
--- grass/trunk/lib/gis/mapset_nme.c 2015-05-05 08:30:59 UTC (rev 65194)
+++ grass/trunk/lib/gis/mapset_nme.c 2015-05-05 10:36:01 UTC (rev 65195)
@@ -17,7 +17,7 @@
#include <unistd.h>
#include <grass/gis.h>
-#include "local_proto.h"
+#include "gis_local_proto.h"
static struct state {
struct list {
Modified: grass/trunk/lib/gis/open.c
===================================================================
--- grass/trunk/lib/gis/open.c 2015-05-05 08:30:59 UTC (rev 65194)
+++ grass/trunk/lib/gis/open.c 2015-05-05 10:36:01 UTC (rev 65195)
@@ -22,7 +22,7 @@
#include <grass/gis.h>
#include <grass/glocale.h>
-#include "local_proto.h"
+#include "gis_local_proto.h"
/*!
\brief Lowest level open routine.
Modified: grass/trunk/lib/gis/open_misc.c
===================================================================
--- grass/trunk/lib/gis/open_misc.c 2015-05-05 08:30:59 UTC (rev 65194)
+++ grass/trunk/lib/gis/open_misc.c 2015-05-05 10:36:01 UTC (rev 65195)
@@ -29,7 +29,7 @@
#include <grass/gis.h>
#include <grass/glocale.h>
-#include "local_proto.h"
+#include "gis_local_proto.h"
static int G__open_misc(const char *dir,
const char *element,
Modified: grass/trunk/lib/gis/put_window.c
===================================================================
--- grass/trunk/lib/gis/put_window.c 2015-05-05 08:30:59 UTC (rev 65194)
+++ grass/trunk/lib/gis/put_window.c 2015-05-05 10:36:01 UTC (rev 65195)
@@ -14,7 +14,7 @@
#include <stdlib.h>
#include <grass/gis.h>
-#include "local_proto.h"
+#include "gis_local_proto.h"
/*!
* \brief Writes the region (window)
Modified: grass/trunk/lib/gis/rd_cellhd.c
===================================================================
--- grass/trunk/lib/gis/rd_cellhd.c 2015-05-05 08:30:59 UTC (rev 65194)
+++ grass/trunk/lib/gis/rd_cellhd.c 2015-05-05 10:36:01 UTC (rev 65195)
@@ -16,7 +16,7 @@
#include <grass/gis.h>
#include <grass/glocale.h>
-#include "local_proto.h"
+#include "gis_local_proto.h"
static int scan_item(const char *, char *, char *);
static int scan_int(const char *, int *);
Modified: grass/trunk/lib/gis/set_window.c
===================================================================
--- grass/trunk/lib/gis/set_window.c 2015-05-05 08:30:59 UTC (rev 65194)
+++ grass/trunk/lib/gis/set_window.c 2015-05-05 10:36:01 UTC (rev 65195)
@@ -16,7 +16,7 @@
#include "G.h"
-#include "local_proto.h"
+#include "gis_local_proto.h"
/*!
\brief Get the current working window (region)
Modified: grass/trunk/lib/gis/tempfile.c
===================================================================
--- grass/trunk/lib/gis/tempfile.c 2015-05-05 08:30:59 UTC (rev 65194)
+++ grass/trunk/lib/gis/tempfile.c 2015-05-05 10:36:01 UTC (rev 65195)
@@ -16,7 +16,7 @@
#include <sys/stat.h>
#include <grass/gis.h>
-#include "local_proto.h"
+#include "gis_local_proto.h"
static struct Counter unique;
static int initialized;
More information about the grass-commit
mailing list