Remove some duplicate headers (much of this to be done...)

git-svn-id: http://svn.osgeo.org/postgis/trunk@8053 b70326c6-7e19-0410-871a-916f4a2858ee
rmunoz · Oct 30, 2011 · 93087d3 · 93087d3
1 parent a7f6661
commit 93087d3
Show file tree

Hide file tree

Showing 21 changed files with 13 additions and 30 deletions.
diff --git a/liblwgeom/box2d.c b/liblwgeom/box2d.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
 #include "liblwgeom_internal.h"
 

diff --git a/liblwgeom/g_box.c b/liblwgeom/g_box.c
@@ -11,7 +11,6 @@
 
 #include "liblwgeom_internal.h"
 #include "lwgeom_log.h"
-#include <math.h>
 #include <stdlib.h>
 
 GBOX* gbox_new(uint8_t flags)

diff --git a/liblwgeom/liblwgeom_internal.h b/liblwgeom/liblwgeom_internal.h
@@ -17,15 +17,18 @@
 #define _LIBLWGEOM_INTERNAL_H 1
 
 #include <assert.h>
-#include "liblwgeom.h"
 #include <stdarg.h>
-#include <string.h>
-#include <math.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
 #if HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
 
+#include "liblwgeom.h"
+
+
 /**
 * PI
 */

diff --git a/liblwgeom/libtgeom.c b/liblwgeom/libtgeom.c
@@ -10,7 +10,6 @@
  *
  **********************************************************************/
 
-#include <stdio.h>
 #include <limits.h>
 #include <assert.h>
 #include <stdlib.h>

diff --git a/liblwgeom/lwcircstring.c b/liblwgeom/lwcircstring.c
@@ -15,7 +15,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 #include "liblwgeom_internal.h"
 #include "lwgeom_log.h"
 

diff --git a/liblwgeom/lwgeodetic.h b/liblwgeom/lwgeodetic.h
@@ -9,7 +9,6 @@
  *
  **********************************************************************/
 
-#include <math.h>
 #include "liblwgeom_internal.h"
 
 extern int gbox_geocentric_slow;

diff --git a/liblwgeom/lwgeom_api.c b/liblwgeom/lwgeom_api.c
@@ -11,15 +11,13 @@
  **********************************************************************/
 
 
-#include <math.h>
+#include "liblwgeom_internal.h"
+#include "lwgeom_log.h"
+
 #include <float.h>
-#include <string.h>
 #include <stdio.h>
 #include <errno.h>
 
-#include "liblwgeom_internal.h"
-#include "lwgeom_log.h"
-
 /*
  * Lower this to reduce integrity checks
  */

diff --git a/liblwgeom/lwgeom_transform.c b/liblwgeom/lwgeom_transform.c
@@ -13,7 +13,6 @@
 #include "proj_api.h"
 #include "liblwgeom.h"
 #include "lwgeom_log.h"
-#include <math.h>
 #include <string.h>
 
 

diff --git a/liblwgeom/lwout_geojson.c b/liblwgeom/lwout_geojson.c
@@ -12,7 +12,6 @@
  **********************************************************************/
 
 #include "liblwgeom_internal.h"
-#include <math.h>	/* fabs */
 #include <string.h>	/* strlen */
 
 static char *asgeojson_point(const LWPOINT *point, char *srs, GBOX *bbox, int precision);

diff --git a/liblwgeom/lwout_gml.c b/liblwgeom/lwout_gml.c
@@ -20,7 +20,6 @@
 
 
 #include <string.h>
-#include <math.h> /* fabs */
 #include "liblwgeom_internal.h"
 
 

diff --git a/liblwgeom/lwout_kml.c b/liblwgeom/lwout_kml.c
@@ -15,7 +15,6 @@
 
 #include "liblwgeom_internal.h"
 #include "stringbuffer.h"
-#include <math.h>	/* fabs */
 
 static int lwgeom_to_kml2_sb(const LWGEOM *geom, int precision, const char *prefix, stringbuffer_t *sb);
 static int lwpoint_to_kml2_sb(const LWPOINT *point, int precision, const char *prefix, stringbuffer_t *sb);

diff --git a/liblwgeom/lwout_svg.c b/liblwgeom/lwout_svg.c
@@ -20,7 +20,6 @@
 **********************************************************************/
 
 #include "liblwgeom_internal.h"
-#include <math.h>  /* fabs */
 
 static char * assvg_point(const LWPOINT *point, int relative, int precision);
 static char * assvg_line(const LWLINE *line, int relative, int precision);

diff --git a/liblwgeom/lwout_x3d.c b/liblwgeom/lwout_x3d.c
@@ -18,8 +18,8 @@
 
 
 #include <string.h>
-#include <math.h> /* fabs */
 #include "liblwgeom_internal.h"
+
 /** defid is the id of the coordinate can be used to hold other elements DEF='abc' transform='' etc. **/
 static size_t asx3d3_point_size(const LWPOINT *point, char *srs, int precision, int opts, const char *defid);
 static char *asx3d3_point(const LWPOINT *point, char *srs, int precision, int opts, const char *defid);

diff --git a/liblwgeom/lwsegmentize.c b/liblwgeom/lwsegmentize.c
@@ -14,7 +14,6 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <math.h>
 
 #include "liblwgeom_internal.h"
 #include "lwgeom_log.h"

diff --git a/liblwgeom/measures.c b/liblwgeom/measures.c
@@ -10,7 +10,6 @@
  *
  **********************************************************************/
 
-#include <math.h>
 #include <string.h>
 #include <stdlib.h>
 

diff --git a/liblwgeom/measures3d.c b/liblwgeom/measures3d.c
@@ -11,7 +11,6 @@
  *
  **********************************************************************/
 
-#include <math.h>
 #include <string.h>
 #include <stdlib.h>
 

diff --git a/liblwgeom/vsprintf.c b/liblwgeom/vsprintf.c
@@ -30,8 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <varargs.h>
 #endif
 
-#include <math.h>
-
 #ifdef TEST
 int global_total_width;
 #endif

diff --git a/libpgcommon/lwgeom_pg.c b/libpgcommon/lwgeom_pg.c
@@ -5,7 +5,7 @@
  * http://postgis.refractions.net
  *
  * Copyright (C) 2011      Sandro Santilli <strk@keybit.net>
- * Copyright (C) 2009-2010 Paul Ramsey <pramsey@cleverelephant.ca>
+ * Copyright (C) 2009-2011 Paul Ramsey <pramsey@cleverelephant.ca>
  * Copyright (C) 2008      Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
  * Copyright (C) 2004-2007 Refractions Research Inc.
  *

diff --git a/libpgcommon/lwgeom_pg.h b/libpgcommon/lwgeom_pg.h
@@ -3,7 +3,7 @@
  * PostGIS - Spatial Types for PostgreSQL
  *
  * Copyright (C) 2011      Sandro Santilli <strk@keybit.net>
- * Copyright (C) 2009-2010 Paul Ramsey <pramsey@cleverelephant.ca>
+ * Copyright (C) 2009-2011 Paul Ramsey <pramsey@cleverelephant.ca>
  * Copyright (C) 2008      Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
  * Copyright (C) 2004-2007 Refractions Research Inc.
  *

diff --git a/libpgcommon/lwgeom_transform.c b/libpgcommon/lwgeom_transform.c
@@ -17,15 +17,12 @@
 #include "liblwgeom.h"
 #include "lwgeom_pg.h"
 
-#include <math.h>
 #include <float.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 
 
-
-
 #include "proj_api.h"
 #include "utils/memutils.h"
 #include "executor/spi.h"

diff --git a/postgis/geography_inout.c b/postgis/geography_inout.c
@@ -2,7 +2,7 @@
  * $Id$
  *
  * PostGIS - Spatial Types for PostgreSQL
- * Copyright 2009 Paul Ramsey <pramsey@cleverelephant.ca>
+ * Copyright 2009-2011 Paul Ramsey <pramsey@cleverelephant.ca>
  *
  * This is free software; you can redistribute and/or modify it under
  * the terms of the GNU General Public Licence. See the COPYING file.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,7 +20,6 @@


		#include <string.h>
		#include <math.h> /* fabs */
		#include "liblwgeom_internal.h"


Expand Down