[GRASS-SVN] r33468 - grass/trunk/include

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-09-16 04:51:15 -0400 (Tue, 16 Sep 2008)
New Revision: 33468

Modified:
   grass/trunk/include/Vect.h
   grass/trunk/include/gisdefs.h
Log:
Remove/disable declarations for non-existent functions


Modified: grass/trunk/include/Vect.h
===================================================================
--- grass/trunk/include/Vect.h	2008-09-16 08:20:24 UTC (rev 33467)
+++ grass/trunk/include/Vect.h	2008-09-16 08:51:15 UTC (rev 33468)
@@ -323,6 +323,10 @@
 int Vect_overlay(struct Map_info *, int, struct ilist *, struct ilist *,
 		 struct Map_info *, int, struct ilist *, struct ilist *,
 		 int, struct Map_info *);
+int Vect_overlay_and(struct Map_info *, int, struct ilist *,
+		     struct ilist *, struct Map_info *, int,
+		     struct ilist *, struct ilist *,
+		     struct Map_info *);
 
     /* Graph */
 void Vect_graph_init(GRAPH *, int);
@@ -403,8 +407,6 @@
     /* Read/write lines */
 int V1_read_line_nat(struct Map_info *, struct line_pnts *,
 		     struct line_cats *, long);
-int V1_read_next_line(struct Map_info *, struct line_pnts *,
-		      struct line_cats *);
 int V1_read_next_line_nat(struct Map_info *, struct line_pnts *,
 			  struct line_cats *);
 int V1_read_next_line_ogr(struct Map_info *, struct line_pnts *,
@@ -413,30 +415,28 @@
 		     struct line_cats *, int);
 int V2_read_line_ogr(struct Map_info *, struct line_pnts *,
 		     struct line_cats *, int);
-int V2_read_next_line(struct Map_info *, struct line_pnts *,
-		      struct line_cats *);
 int V2_read_next_line_nat(struct Map_info *, struct line_pnts *,
 			  struct line_cats *);
 int V2_read_next_line_ogr(struct Map_info *, struct line_pnts *,
 			  struct line_cats *);
-int V1_delete_line(struct Map_info *, long);
-int V2_delete_line(struct Map_info *, int);
 int V1_delete_line_nat(struct Map_info *, long);
 int V2_delete_line_nat(struct Map_info *, int);
 long V1_write_line_nat(struct Map_info *, int type, struct line_pnts *,
 		       struct line_cats *);
 long V2_write_line_nat(struct Map_info *, int type, struct line_pnts *,
 		       struct line_cats *);
+#if 0
 long V1_write_line_ogr(struct Map_info *, int type, struct line_pnts *,
 		       struct line_cats *);
-long V1_rewrite_line(struct Map_info *, long offset, int type,
-		     struct line_pnts *, struct line_cats *);
+#endif
 long V1_rewrite_line_nat(struct Map_info *, long offset, int type,
 			 struct line_pnts *, struct line_cats *);
 int V2_rewrite_line_nat(struct Map_info *, int line, int type,
 			struct line_pnts *, struct line_cats *);
+#if 0
 long V1_rewrite_line_ogr(struct Map_info *, long offset, int type,
 			 struct line_pnts *, struct line_cats *);
+#endif
 
     /* Miscellaneous */
 int Vect_build_nat(struct Map_info *, int, FILE *);

Modified: grass/trunk/include/gisdefs.h
===================================================================
--- grass/trunk/include/gisdefs.h	2008-09-16 08:20:24 UTC (rev 33467)
+++ grass/trunk/include/gisdefs.h	2008-09-16 08:51:15 UTC (rev 33468)
@@ -640,9 +640,6 @@
 			      double, double, double *, double *, double *,
 			      double *);
 
-/* intr_char.c */
-char G_intr_char(void);
-
 /* is.c */
 int G_is_gisbase(const char *);
 int G_is_location(const char *);
@@ -768,7 +765,6 @@
 void G_newlines_to_spaces(char *);
 
 /* nme_in_mps.c */
-int G__name_in_mapset(const char *, char *, char *);
 int G__name_is_fully_qualified(const char *, char *, char *);
 char *G_fully_qualified_name(const char *, const char *);
 int G__unqualified_name(const char *, const char *, char *, char *);