浏览代码

diglib and ps.map: removing _STDIO_H preprocessor ifndefs and ifdef because they break compilation with clang (LLVM) on Mac OS X Mavericks‎ 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)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@58435 15284696-431f-4ddb-bdfa-cd5b030d7da7
Vaclav Petras 11 年之前
父节点
当前提交
8893d781fb
共有 4 个文件被更改,包括 3 次插入13 次删除
  1. 0 2
      include/bitmap.h
  2. 0 2
      include/defs/dig_atts.h
  3. 0 3
      include/vect/dig_structs.h
  4. 3 6
      ps/ps.map/local_proto.h

+ 0 - 2
include/bitmap.h

@@ -33,9 +33,7 @@ struct BMlink
     struct BMlink *next;
 };
 
-#ifndef _STDIO_H
 #include <stdio.h>
-#endif
 
 #include <grass/defs/bitmap.h>
 

+ 0 - 2
include/defs/dig_atts.h

@@ -1,6 +1,4 @@
-#ifndef _STDIO_H
 #include <stdio.h>
-#endif
 
 /*
    #define              WRITE_ATT_FORMAT        "%c  %12.2lf  %12.2lf  %8d"

+ 0 - 3
include/vect/dig_structs.h

@@ -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>
 

+ 3 - 6
ps/ps.map/local_proto.h

@@ -42,9 +42,8 @@ int read_header_file(const char *);
 /* 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 add_to_session(int, char *);
 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 yesno(char *, char *);
 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