dtksh: HACKY fix for compilation on later linux C library where FILE definition has moved

cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c

@@ -108,6 +108,12 @@
 #include	"national.h"
 
 #if _hdr_wchar && _lib_wctype && _lib_iswctype
+/* on linux wchar.h can include FILE without stdio.h which clashes with sfio_t */
+#if defined(linux)
+ #ifndef __FILE_defined
+  #define __FILE_defined 1
+ #endif
+#endif
 #   include <wchar.h>
 #   undef  isalpha
 #   define isalpha(x)      iswalpha(x)

cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/macro.c

@@ -94,6 +94,12 @@
 #endif
 #include	"defs.h"
 #include	<fcin.h>
+/* on linux pwd.h can include FILE without stdio.h which clashes with sfio_t */
+#if defined(linux)
+ #ifndef __FILE_defined
+  #define __FILE_defined 1
+ #endif
+#endif
 #include	<pwd.h>
 #include	"name.h"
 #include	"variables.h"

cde/programs/dtksh/ksh93/src/lib/libast/include/ast.h

@@ -121,13 +121,7 @@
  * workaround botched headers that assume <stdio.h>
  */
 
-#if defined(linux)
+#if !defined(CSRG_BASED) && !defined(linux)
-#ifndef __FILE
-#define __FILE	FILE
-#endif
-#endif
-
-#if !defined(CSRG_BASED)
 #ifndef FILE
 #define FILE	Sfio_t
 #endif

cde/programs/dtksh/ksh93/src/lib/libast/include/sfio.h

@@ -149,7 +149,7 @@
 #define _STDIO_INCLUDED	1
 #endif
 
-#if !defined(CSRG_BASED)
+#if !defined(CSRG_BASED) && !defined(linux)
 #ifndef FILE
 #define FILE	Sfio_t
 #endif
@@ -161,6 +161,9 @@
 #endif
 
 typedef struct _sfio_	Sfile_t, Sfio_t, SFIO;
+#if defined(linux)
+typedef struct _sfio_	FILE;
+#endif
 typedef struct _sfdc_	Sfdisc_t;
 typedef int		(*Sfread_f)_ARG_((Sfio_t*, Void_t*, int, Sfdisc_t*));
 typedef int		(*Sfwrite_f)_ARG_((Sfio_t*, const Void_t*, int, Sfdisc_t*));

cde/programs/dtksh/ksh93/src/lib/libast/include/stdio.h

@@ -50,10 +50,12 @@
 #define stdout		sfstdout
 #define stderr		sfstderr
 #define BUFSIZ		SF_BUFSIZE
+#if !defined(linux)
 #ifdef FILE
 #undef FILE
 #endif
 #define FILE		Sfio_t
+#endif
 
 #include	<sfio.h>
 

cde/programs/dtksh/ksh93/src/lib/libast/string/fmtfs.c

@@ -120,6 +120,12 @@ __STDPP__directive pragma pp:hide endmntent getmntent
 #define getmntent	______getmntent
 #endif
 
+/* on linux mntent.h can include FILE without stdio.h which clashes with sfio_t */
+#if defined(linux)
+ #ifndef __FILE_defined
+  #define __FILE_defined 1
+ #endif
+#endif
 #include <mntent.h>
 
 #if defined(__STDPP__directive) && defined(__STDPP__hide)

cde/programs/dtksh/ksh93/src/lib/libast/string/fmtgid.c

@@ -98,6 +98,12 @@ __STDPP__directive pragma pp:hide getgrgid
 
 #include <ast.h>
 #include <hash.h>
+/* on linux grp.h can include FILE without stdio.h which clashes with sfio_t */
+#if defined(linux)
+ #ifndef __FILE_defined
+  #define __FILE_defined 1
+ #endif
+#endif
 #include <grp.h>
 
 #if defined(__STDPP__directive) && defined(__STDPP__hide)

cde/programs/dtksh/ksh93/src/lib/libast/string/fmtuid.c

@@ -98,6 +98,12 @@ __STDPP__directive pragma pp:hide getpwuid
 
 #include <ast.h>
 #include <hash.h>
+/* on linux pwd.h can include FILE without stdio.h which clashes with sfio_t */
+#if defined(linux)
+ #ifndef __FILE_defined
+  #define __FILE_defined 1
+ #endif
+#endif
 #include <pwd.h>
 
 #if defined(__STDPP__directive) && defined(__STDPP__hide)

cde/programs/dtksh/ksh93/src/lib/libast/string/strgid.c

@@ -100,6 +100,12 @@ __STDPP__directive pragma pp:hide getgrgid getgrnam getpwnam
 
 #include <ast.h>
 #include <hash.h>
+/* on linux pwd.h and grp.h can include FILE without stdio.h which clashes with sfio_t */
+#if defined(linux)
+ #ifndef __FILE_defined
+  #define __FILE_defined 1
+ #endif
+#endif
 #include <pwd.h>
 #include <grp.h>
 

cde/programs/dtksh/ksh93/src/lib/libast/string/strmatch.c

@@ -95,6 +95,12 @@
 
 #if _hdr_wchar && _lib_wctype && _lib_iswctype
 
+/* on linux wchar.h can include FILE without stdio.h which clashes with sfio_t */
+#if defined(linux)
+ #ifndef __FILE_defined
+  #define __FILE_defined 1
+ #endif
+#endif
 #include <wchar.h>
 
 #undef	isalnum

cde/programs/dtksh/ksh93/src/lib/libast/string/struid.c

@@ -99,6 +99,12 @@ __STDPP__directive pragma pp:hide getpwnam getpwuid
 
 #include <ast.h>
 #include <hash.h>
+/* on linux pwd.h can include FILE without stdio.h which clashes with sfio_t */
+#if defined(linux)
+ #ifndef __FILE_defined
+  #define __FILE_defined 1
+ #endif
+#endif
 #include <pwd.h>
 
 #if defined(__STDPP__directive) && defined(__STDPP__hide)

cde/programs/dtksh/ksh93/src/lib/libcmd/id.c

@@ -96,6 +96,12 @@ static const char id[] = "\n@(#)id (AT&T Bell Laboratories) 07/17/94\0\n";
 
 #include "FEATURE/ids"
 
+/* on linux grp.h pwd.h can include FILE without stdio.h which clashes with sfio_t */
+#if defined(linux)
+ #ifndef __FILE_defined
+  #define __FILE_defined 1
+ #endif
+#endif
 #include <grp.h>
 #include <pwd.h>