Skip to content

Commit

Permalink
Remove angle brackets for proj headers (#849)
Browse files Browse the repository at this point in the history
* Avoid using angle brackets for PROJ headers.

Switching from #include <proj.h> to #include "proj.h",
and correspondingly for projects.h and proj_api.h,
reduces the risk of accidentally picking up a system
installed older version of the header while building
a new version of PROJ.

* Also handle geodesic.h
  • Loading branch information
busstoptaktik authored and kbevers committed Mar 11, 2018
1 parent 7e9d6d6 commit 2b143b4
Show file tree
Hide file tree
Showing 118 changed files with 122 additions and 122 deletions.
2 changes: 1 addition & 1 deletion src/PJ_aea.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*****************************************************************************/

#define PJ_LIB__
#include <proj.h>
#include "proj.h"
#include <errno.h>
#include "projects.h"

Expand Down
2 changes: 1 addition & 1 deletion src/PJ_aeqd.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#define PJ_LIB__
#include "geodesic.h"
#include <proj.h>
#include "proj.h"
#include <errno.h>
#include "projects.h"

Expand Down
2 changes: 1 addition & 1 deletion src/PJ_airy.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
*****************************************************************************/

#define PJ_LIB__
#include <proj.h>
#include "proj.h"
#include <errno.h>
#include "projects.h"

Expand Down
2 changes: 1 addition & 1 deletion src/PJ_aitoff.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*****************************************************************************/

#define PJ_LIB__
#include <proj.h>
#include "proj.h"
#include <errno.h>
#include "projects.h"

Expand Down
2 changes: 1 addition & 1 deletion src/PJ_bacon.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# define EPS 1e-10
#define PJ_LIB__
#include <errno.h>
#include <projects.h>
#include "projects.h"


struct pj_opaque {
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_bipc.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define PJ_LIB__
#include <proj.h>
#include "proj.h"
#include <errno.h>
#include "projects.h"

Expand Down
2 changes: 1 addition & 1 deletion src/PJ_boggs.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
# include <errno.h>
# include <projects.h>
# include "projects.h"
PROJ_HEAD(boggs, "Boggs Eumorphic") "\n\tPCyl., no inv., Sph.";
# define NITER 20
# define EPS 1e-7
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_bonne.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(bonne, "Bonne (Werner lat_1=90)")
Expand Down
4 changes: 2 additions & 2 deletions src/PJ_calcofi.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define PJ_LIB__
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(calcofi,
Expand All @@ -8,7 +8,7 @@ PROJ_HEAD(calcofi,
#include <string.h>
#include <stdio.h>
#include <math.h>
#include <proj_api.h>
#include "proj_api.h"
#include <errno.h>

/* Conversions for the California Cooperative Oceanic Fisheries Investigations
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_cc.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define PJ_LIB__
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(cc, "Central Cylindrical") "\n\tCyl, Sph";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_ccon.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

#define EPS10 1e-10
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_cea.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

struct pj_opaque {
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_chamb.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

typedef struct { double r, Az; } VECT;
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_collg.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define PJ_LIB__
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(collg, "Collignon") "\n\tPCyl, Sph.";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_comill.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Port to PROJ.4 by Bojan Savric, 4 April 2016
*/

#define PJ_LIB__
#include <projects.h>
#include "projects.h"

PROJ_HEAD(comill, "Compact Miller") "\n\tCyl., Sph.";

Expand Down
2 changes: 1 addition & 1 deletion src/PJ_crast.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define PJ_LIB__
# include <projects.h>
# include "projects.h"

PROJ_HEAD(crast, "Craster Parabolic (Putnins P4)") "\n\tPCyl., Sph.";

Expand Down
2 changes: 1 addition & 1 deletion src/PJ_deformation.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ grid-values in units of mm/year in ENU-space.
***********************************************************************/
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "proj_internal.h"
#include "projects.h"

Expand Down
2 changes: 1 addition & 1 deletion src/PJ_denoy.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define PJ_LIB__
#include <projects.h>
#include "projects.h"

PROJ_HEAD(denoy, "Denoyer Semi-Elliptical") "\n\tPCyl., no inv., Sph.";

Expand Down
2 changes: 1 addition & 1 deletion src/PJ_eck2.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define PJ_LIB__
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(eck2, "Eckert II") "\n\tPCyl. Sph.";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_eck4.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define PJ_LIB__
#include <projects.h>
#include "projects.h"

PROJ_HEAD(eck4, "Eckert IV") "\n\tPCyl, Sph.";

Expand Down
2 changes: 1 addition & 1 deletion src/PJ_eqc.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

struct pj_opaque {
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_eqdc.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

struct pj_opaque {
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_fahey.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define PJ_LIB__
#include <projects.h>
#include "projects.h"

PROJ_HEAD(fahey, "Fahey") "\n\tPcyl, Sph.";

Expand Down
2 changes: 1 addition & 1 deletion src/PJ_fouc_s.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(fouc_s, "Foucaut Sinusoidal") "\n\tPCyl., Sph.";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_gall.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define PJ_LIB__
#include <projects.h>
#include "projects.h"

PROJ_HEAD(gall, "Gall (Gall Stereographic)") "\n\tCyl, Sph";

Expand Down
2 changes: 1 addition & 1 deletion src/PJ_geoc.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
*****************************************************************************/

#define PJ_LIB__
#include <proj.h>
#include "proj.h"
#include <errno.h>
#include "projects.h"

Expand Down
2 changes: 1 addition & 1 deletion src/PJ_geos.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

struct pj_opaque {
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_gn_sinu.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(gn_sinu, "General Sinusoidal Series") "\n\tPCyl, Sph.\n\tm= n=";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_gnom.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(gnom, "Gnomonic") "\n\tAzi, Sph.";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_goode.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(goode, "Goode Homolosine") "\n\tPCyl, Sph.";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_hammer.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(hammer, "Hammer & Eckert-Greifendorff")
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_hatano.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define PJ_LIB__
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(hatano, "Hatano Asymmetrical Equal Area") "\n\tPCyl, Sph.";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_healpix.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# define PJ_LIB__
# include <errno.h>
# include "proj_internal.h"
# include <proj.h>
# include "proj.h"
# include "projects.h"

PROJ_HEAD(healpix, "HEALPix") "\n\tSph., Ellps.";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_imw_p.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(imw_p, "International Map of the World Polyconic")
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_isea.c
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ isea_forward(struct isea_dgg *g, struct isea_geo *in)

#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(isea, "Icosahedral Snyder Equal Area") "\n\tSph";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_laea.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(laea, "Lambert Azimuthal Equal Area") "\n\tAzi, Sph&Ell";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_lagrng.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(lagrng, "Lagrange") "\n\tMisc Sph, no inv.\n\tW=";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_lcc.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(lcc, "Lambert Conformal Conic")
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_lcca.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(lcca, "Lambert Conformal Conic Alternative")
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_loxim.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(loxim, "Loximuthal") "\n\tPCyl Sph";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_lsat.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* based upon Snyder and Linck, USGS-NMD */
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(lsat, "Space oblique for LANDSAT")
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_mbtfpp.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define PJ_LIB__
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(mbtfpp, "McBride-Thomas Flat-Polar Parabolic") "\n\tCyl., Sph.";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_mbtfpq.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define PJ_LIB__
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(mbtfpq, "McBryde-Thomas Flat-Polar Quartic") "\n\tCyl., Sph.";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_merc.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define PJ_LIB__
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(merc, "Mercator") "\n\tCyl, Sph&Ell\n\tlat_ts=";
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_misrsom.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/* based upon Snyder and Linck, USGS-NMD */
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

PROJ_HEAD(misrsom, "Space oblique for MISR")
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_molodensky.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
***********************************************************************/
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "proj_internal.h"
#include "projects.h"

Expand Down
2 changes: 1 addition & 1 deletion src/PJ_nsper.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"

enum Mode {
Expand Down
2 changes: 1 addition & 1 deletion src/PJ_ob_tran.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define PJ_LIB__
#include <errno.h>
#include <proj.h>
#include "proj.h"
#include "projects.h"
#include <string.h>

Expand Down
Loading

0 comments on commit 2b143b4

Please sign in to comment.