[ksh93-integration-discuss] libast |fnmatch| --> |_ast_fnmatch| mapping fix...

[Roland Mainz]

Hi!

----

Attached is a small patch
("ksh93_fnmatch_ast_fnmatch_mapping_fix_001.diff.txt") which fixes the
problem that libast provides it's own version of |fnmatch()| as symbol
|fnmatch| instead of |_ast_fnmatch| (the #define from "ast_map.h" seems
to be overridden).

----

Bye,
Roland

-- 
  __ .  . __
 (o.\ \/ /.o) roland.mainz at nrubsig.org
  \__\/\/__/  MPEG specialist, C&&JAVA&&Sun&&Unix programmer
  /O /==\ O\  TEL +49 641 7950090
 (;O/ \/ \O;)
-------------- next part --------------
Index: common/comp/fnmatch.c
===================================================================
--- common/comp/fnmatch.c	(revision 358)
+++ common/comp/fnmatch.c	(working copy)
@@ -34,6 +34,16 @@
 
 #else
 
+#include <ast_map.h>
+
+#ifdef fnmatch
+
+#include <ast.h>
+#include <regex.h>
+#include <fnmatch.h>
+
+#else
+
 #define fnmatch		______fnmatch
 
 #include <ast.h>
@@ -42,6 +52,8 @@
 
 #undef	fnmatch
 
+#endif /* fnmatch */
+
 typedef struct
 {
 	int	fnm;		/* fnmatch flag			*/
Index: i386/include/ast/fnmatch.h
===================================================================
--- i386/include/ast/fnmatch.h	(revision 358)
+++ i386/include/ast/fnmatch.h	(working copy)
@@ -34,6 +34,8 @@
 #define __LINKAGE__		/* 2004-08-11 transition */
 #endif
 
+#include <ast_map.h>
+
 #define _FNMATCH_H
 
 /* fnmatch flags */
Index: spec/ast.spec
===================================================================
--- spec/ast.spec	(revision 361)
+++ spec/ast.spec	(working copy)
@@ -310,7 +310,6 @@
 # _ast_fmtperm
 # _ast_fmtnesq
 # _ast_mimeclose
-# _ast_fnmatch
 # _ast_ccmapname
 # _ast_ccmaplist
 # _ast_waitpid
@@ -2022,7 +2021,7 @@
 include		<ast/find.h>
 version         SUNWprivate_1.1
 end
-function	fnmatch
+function	_ast_fnmatch
 include		<ast/fnmatch.h>
 version         SUNWprivate_1.1
 end