[GRASS-SVN] r58435 - in grass/trunk: include include/defs include/vect ps/ps.map

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2013-12-10 09:21:19 -0800 (Tue, 10 Dec 2013)
New Revision: 58435

Modified:
   grass/trunk/include/bitmap.h
   grass/trunk/include/defs/dig_atts.h
   grass/trunk/include/vect/dig_structs.h
   grass/trunk/ps/ps.map/local_proto.h
Log:
diglib and ps.map: removing _STDIO_H preprocessor ifndefs and ifdef because they break compilation with clang (LLVM) on Mac OS X Mavericks?\226?\128?\142 where _STDIO_H define is not defined (we suppose to have stdio always so there is no point in checking it and this define is not a part of standard library interface)

Modified: grass/trunk/include/bitmap.h
===================================================================
--- grass/trunk/include/bitmap.h	2013-12-10 16:50:33 UTC (rev 58434)
+++ grass/trunk/include/bitmap.h	2013-12-10 17:21:19 UTC (rev 58435)
@@ -33,9 +33,7 @@
     struct BMlink *next;
 };
 
-#ifndef _STDIO_H
 #include <stdio.h>
-#endif
 
 #include <grass/defs/bitmap.h>
 

Modified: grass/trunk/include/defs/dig_atts.h
===================================================================
--- grass/trunk/include/defs/dig_atts.h	2013-12-10 16:50:33 UTC (rev 58434)
+++ grass/trunk/include/defs/dig_atts.h	2013-12-10 17:21:19 UTC (rev 58435)
@@ -1,6 +1,4 @@
-#ifndef _STDIO_H
 #include <stdio.h>
-#endif
 
 /*
    #define              WRITE_ATT_FORMAT        "%c  %12.2lf  %12.2lf  %8d"

Modified: grass/trunk/include/vect/dig_structs.h
===================================================================
--- grass/trunk/include/vect/dig_structs.h	2013-12-10 16:50:33 UTC (rev 58434)
+++ grass/trunk/include/vect/dig_structs.h	2013-12-10 17:21:19 UTC (rev 58435)
@@ -13,10 +13,7 @@
 #ifndef  DIG___STRUCTS___
 #define DIG___STRUCTS___
 
-/*  this file depends on <stdio.h> */
-#ifndef _STDIO_H
 #include <stdio.h>
-#endif
 
 #include <sys/types.h>
 

Modified: grass/trunk/ps/ps.map/local_proto.h
===================================================================
--- grass/trunk/ps/ps.map/local_proto.h	2013-12-10 16:50:33 UTC (rev 58434)
+++ grass/trunk/ps/ps.map/local_proto.h	2013-12-10 17:21:19 UTC (rev 58435)
@@ -42,9 +42,8 @@
 /* do_labels.c */
 int do_labels(int);
 
-#ifdef _STDIO_H
 int do_label(FILE *, int);
-#endif
+
 /* do_masking.c */
 int do_masking(void);
 
@@ -271,9 +270,8 @@
 int accept(void);
 int reject(void);
 
-#ifdef _STDIO_H
 int print_session(FILE *);
-#endif
+
 /* show_scale.c */
 int show_scale(void);
 
@@ -299,9 +297,8 @@
 int eps_bbox(char *, double *, double *, double *, double *);
 int eps_trans(double, double, double, double, double, double, double, double,
 	      double *, double *);
-#ifdef _STDIO_H
+
 int eps_save(FILE *, char *, char *);
 int eps_draw_saved(char *, double, double, double, double);
 int eps_draw(FILE *, char *, double, double, double, double);
 int pat_save(FILE *, char *, char *);
-#endif