libgis: merge local_proto.h with gis_local_proto.h

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@65195 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/gis/error.c

@@ -22,7 +22,7 @@
 #include <grass/glocale.h>
 #include <grass/gis.h>
 
-#include "local_proto.h"
+#include "gis_local_proto.h"
 
 /*!
  * \def MSG

lib/gis/get_window.c

@@ -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;

lib/gis/gis_local_proto.h

@@ -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

lib/gis/gisinit.c

@@ -24,7 +24,7 @@
 #include <grass/glocale.h>
 
 #include "G.h"
-#include "local_proto.h"
+#include "gis_local_proto.h"
 
 struct G__ G__;
 

lib/gis/home.c

@@ -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

lib/gis/local_proto.h

@@ -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__ */

lib/gis/mapset_nme.c

@@ -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 {

lib/gis/open.c

@@ -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.

lib/gis/open_misc.c

@@ -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,

lib/gis/put_window.c

@@ -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)

lib/gis/rd_cellhd.c

@@ -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 *);

lib/gis/set_window.c

@@ -16,7 +16,7 @@
 
 #include "G.h"
 
-#include "local_proto.h"
+#include "gis_local_proto.h"
 
 /*!
   \brief Get the current working window (region)

lib/gis/tempfile.c

@@ -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;