Minor changes to header inclusions.

git-svn-id: http://svn.osgeo.org/postgis/trunk@5037 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/loader/getopt.c b/loader/getopt.c
index 21c67f05a516c4497fdea7530c0485f35c69a6d2..834dac07b4ef050ed13a873e769983ddccd62c63 100644 (file)
--- a/loader/getopt.c
+++ b/loader/getopt.c
@@ -2,9 +2,12 @@
 **      @(#)getopt.c    2.5 (smail) 9/15/87
 */
 
+#include "../postgis_config.h"
 #include <stdio.h>
 #include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include "getopt.h"
 
 /*

diff --git a/loader/pgsql2shp.c b/loader/pgsql2shp.c
index 759c9ba985000194ce8e1599693c27782972a034..cfccf5c0e4db6158df8f9db7444fabb3fe3bc9df 100644 (file)
--- a/loader/pgsql2shp.c
+++ b/loader/pgsql2shp.c
@@ -12,14 +12,12 @@
  *
  * PostGIS to Shapefile converter
  *
- * Original Author: Jeff Lounsbury, jeffloun@refractions.net
- *
- * Maintainer: Sandro Santilli, strk@refractions.net
+ * Original Author: Jeff Lounsbury <jeffloun@refractions.net>
+ * Maintainer: Sandro Santilli <strk@keybit.bet>
  *
  **********************************************************************/
 
-static char rcsid[] =
-  "$Id$";
+static char rcsid[] = "$Id$";
 
 #include "../postgis_config.h"
 
@@ -32,16 +30,20 @@ static char rcsid[] =
 /* Solaris9 does not provide stdint.h */
 /* #include <stdint.h> */
 #include <inttypes.h>
-#include "libpq-fe.h"
-#include "shapefil.h"
-#include "getopt.h"
 #include <sys/types.h> // for getpid()
-#include <unistd.h> // for getpid() and getopt
+
+#ifdef HAVE_UNISTD_H // for getpid() and getopt
+#include <unistd.h> 
+#endif
 
 #ifdef __CYGWIN__
 #include <sys/param.h>
 #endif
 
+#include "libpq-fe.h"
+#include "shapefil.h"
+#include "getopt.h"
+
 #include "../liblwgeom/liblwgeom.h"
 
 /*

diff --git a/loader/shp2pgsql-core.h b/loader/shp2pgsql-core.h
index c6eded80e39083176b7c43f144a88a75bc2c1cef..783eff7fbcaf5aa5d57ea2f1d35f6d39c39c199a 100644 (file)
--- a/loader/shp2pgsql-core.h
+++ b/loader/shp2pgsql-core.h
@@ -4,12 +4,13 @@
  * PostGIS - Spatial Types for PostgreSQL
  * http://postgis.refractions.net
  * Copyright 2001-2003 Refractions Research Inc.
- * Copyright 2009 Paul Ramsey
+ * Copyright 2009 Paul Ramsey <pramsey@cleverelephant.ca>
  * Copyright 2009 Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
  *
  * This is free software; you can redistribute and/or modify it under
  * the terms of the GNU General Public Licence. See the COPYING file.
- */
+ *
+ **********************************************************************/
 
 #include <stdio.h>
 #include <string.h>