OCC10009 regexp is duplicated in Strandard and WOKNT packages Standard_regexp.h...

diff --git a/src/WOKNT/WOKNT_Shell_1.cxx b/src/WOKNT/WOKNT_Shell_1.cxx
index 01f239e6d73761a5e258162484a6173658bc7a50..2ef0985b1e384a2d8d8eb982a00975f49e861052 100755 (executable)
--- a/src/WOKNT/WOKNT_Shell_1.cxx
+++ b/src/WOKNT/WOKNT_Shell_1.cxx
@@ -11,7 +11,7 @@
 #include <OSD_Path.hxx>
 #include <OSD_SharedLibrary.hxx>
 
-#include <Standard_regexp.h>
+#include <WOKNT_regexp.h>
 #include <stdio.h>
 
 typedef int ( *EXT_FUNC ) ( int, TCHAR** );

diff --git a/src/WOKNT/WOKNT_regexp_1.c b/src/WOKNT/WOKNT_regexp_1.c
index 777d80de6b23d9457a49225bc25c0c873e6a5ee8..01f0c4dfda86d74606cafea534dfe1c02ad22109 100755 (executable)
--- a/src/WOKNT/WOKNT_regexp_1.c
+++ b/src/WOKNT/WOKNT_regexp_1.c
@@ -23,19 +23,6 @@
 /******************************************************************************/
 /***/
 
-/* JGA : to compile on Solaris */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-/* alloca() non disponible sur HPUX 9.07 */
-#ifdef __cplusplus
-extern "C" {
-#endif  
-void *alloca(unsigned int);
-# ifdef __cplusplus
-}
-#endif
 
 #include <WOKNT_regexp.h>
 
@@ -1351,7 +1338,7 @@ int re_match_2 (
 
       d2 = string2, dend2 = regend[ regno ];  /* end of string1 => advance to string2. */
                  
-     }  /* end while
+     }  /* end while */
        
      /* At end of register contents => success */
      if ( d2 == dend2 ) break;