Update of /cvsroot/meshdb/src/geo/libgeo
In directory sc8-pr-cvs1:/tmp/cvs-serv21264/libgeo
Modified Files:
alt.c image-png.c ntv2.c qt.c spread.c
Log Message:
Make compat includes explicit so as to avoid masking the real headers when we want them i.e. force a #include compat/err.h so we can #include <err.h> to pick up the platform's err.h.
Index: alt.c
===================================================================
RCS file: /cvsroot/meshdb/src/geo/libgeo/alt.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- alt.c 10 Aug 2002 03:51:32 -0000 1.1.1.1
+++ alt.c 24 Nov 2003 07:04:48 -0000 1.2
@@ -12,7 +12,8 @@
#include <math.h>
#include <ieeefp.h>
#include <fcntl.h>
-#include <err.h>
+
+#include "compat/err.h"
#include "qt.h"
#include "geodesy.h"
#include "ntv2.h"
Index: image-png.c
===================================================================
RCS file: /cvsroot/meshdb/src/geo/libgeo/image-png.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- image-png.c 10 Aug 2002 03:51:32 -0000 1.1.1.1
+++ image-png.c 24 Nov 2003 07:04:49 -0000 1.2
@@ -1,6 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <err.h>
+
+#include "compat/err.h"
#include "png.h"
#include "image.h"
Index: ntv2.c
===================================================================
RCS file: /cvsroot/meshdb/src/geo/libgeo/ntv2.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ntv2.c 24 Nov 2003 05:09:31 -0000 1.2
+++ ntv2.c 24 Nov 2003 07:04:49 -0000 1.3
@@ -10,13 +10,13 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <err.h>
#include <math.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
-#include "compat.h"
+#include "compat/compat.h"
+#include "compat/err.h"
#include "ntv2.h"
int ntv2_verbose = 0;
Index: qt.c
===================================================================
RCS file: /cvsroot/meshdb/src/geo/libgeo/qt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qt.c 24 Nov 2003 04:36:39 -0000 1.2
+++ qt.c 24 Nov 2003 07:04:49 -0000 1.3
@@ -10,10 +10,10 @@
#include <unistd.h>
#include <string.h>
#include <libgen.h>
-#include <err.h>
#include <sys/types.h>
#include <sys/mman.h>
+#include "compat/err.h"
#include "qt.h"
#include "spread.h"
Index: spread.c
===================================================================
RCS file: /cvsroot/meshdb/src/geo/libgeo/spread.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- spread.c 10 Aug 2002 03:51:32 -0000 1.1.1.1
+++ spread.c 24 Nov 2003 07:04:49 -0000 1.2
@@ -7,7 +7,8 @@
#include <stdio.h>
#include <stdlib.h>
-#include <err.h>
+
+#include "compat/err.h"
#include "spread.h"
unsigned long *spread_lookup;
|
