Next QNX fix attempt: Move all _FILE_defined hackery into ast_std.h

Author: JohnoKing

src/lib/libast/include/ast.h

@@ -48,32 +48,6 @@
 #define PATH_MAX	1024
 #endif
 
-/*
- * work around botched headers that assume <stdio.h>
- */
-
-#ifndef FILE
-#define FILE		struct _sfio_s
-#ifndef __FILE_typedef
-#define __FILE_typedef	1
-#endif
-#ifndef _FILE_DEFINED
-#define _FILE_DEFINED   1
-#endif
-#ifndef _FILE_defined
-#define _FILE_defined   1
-#endif
-#ifndef _FILEDEFED
-#define _FILEDEFED	1
-#endif
-#ifndef __FILE_defined
-#define __FILE_defined  1
-#endif
-#ifndef ____FILE_defined
-#define ____FILE_defined  1
-#endif
-#endif
-
 /*
  * tcc on FreeBSD: Avoid using nonexistent math
  * builtins by pretending to be an ancient gcc.

src/lib/libast/include/ast_std.h

@@ -63,6 +63,11 @@ struct _sfio_s;
 #include <ast_fcntl.h>
 #include <ast_limits.h>
 
+/*
+ * Workaround for implementing SFIO's version of FILE*
+ * (system headers of course assume FILE* is a different type).
+ */
+
 #ifdef	_SKIP_SFSTDIO_H
 #undef	_SKIP_SFSTDIO_H
 #else
@@ -90,6 +95,12 @@ struct _sfio_s;
 #ifndef __DEFINED_FILE
 #define __DEFINED_FILE 1
 #endif
+#ifndef _FILE_DEFINED
+#define _FILE_DEFINED   1
+#endif
+#ifndef _FILE_defined
+#define _FILE_defined   1
+#endif
 #endif
 
 #undef	getenv