It seems like including <wchar.h> prevents libast
to create its own stdio system.

This may also help other platforms to build dtksh
successfully.
---
 cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c          | 2 +-
 cde/programs/dtksh/ksh93/src/lib/libast/include/sfio.h    | 1 +
 cde/programs/dtksh/ksh93/src/lib/libast/string/strmatch.c | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c 
b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c
index 43b6fe3..6c49c3d 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c
@@ -107,7 +107,7 @@
 #include       "FEATURE/locale"
 #include       "national.h"
 
-#if _hdr_wchar && _lib_wctype && _lib_iswctype
+#if _hdr_wchar && _lib_wctype && _lib_iswctype && dont
 #   include <wchar.h>
 #   undef  isalpha
 #   define isalpha(x)      iswalpha(x)
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/include/sfio.h 
b/cde/programs/dtksh/ksh93/src/lib/libast/include/sfio.h
index e51c073..448f3e5 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/include/sfio.h
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/include/sfio.h
@@ -151,6 +151,7 @@
 
 #ifndef FILE
 #define FILE   Sfio_t
+#define _STDFILE_DECLARED
 #endif
 #endif /* __cplusplus */
 
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/string/strmatch.c 
b/cde/programs/dtksh/ksh93/src/lib/libast/string/strmatch.c
index ceb679b..b82ba3a 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/string/strmatch.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/string/strmatch.c
@@ -93,7 +93,7 @@
 #include <ast.h>
 #include <ctype.h>
 
-#if _hdr_wchar && _lib_wctype && _lib_iswctype
+#if _hdr_wchar && _lib_wctype && _lib_iswctype && dont
 
 #include <wchar.h>
 
-- 
1.7.11.5


------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://ad.doubleclick.net/clk;258768047;13503038;j?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Reply via email to