bug 3054
Allan Cornet [Tue, 27 May 2008 09:55:33 +0000 (09:55 +0000)]
12 files changed:
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/fileio.vcproj
scilab/modules/fileio/includes/ConvertPathUnixToWindows.h [deleted file]
scilab/modules/fileio/src/c/ConvertPathUnixToWindows.c [deleted file]
scilab/modules/tclsci/scilab_windows_Import.def
scilab/modules/tclsci/src/c/EnvTclTk.c
scilab/modules/tclsci/src/c/EnvTclTk.h
scilab/modules/tclsci/src/c/InitTclTk.c
scilab/modules/windows_tools/includes/ConvertSlash.h [new file with mode: 0644]
scilab/modules/windows_tools/src/c/scilab_windows/ConvertSlash.c [new file with mode: 0644]
scilab/modules/windows_tools/src/c/scilab_windows/SetScilabEnvironmentVariables.c
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcproj

index 672ae2f..cb84285 100644 (file)
@@ -33,7 +33,6 @@ src/c/getshortpathname.c \
 src/c/getlongpathname.c \
 src/c/FindFileExtension.c \
 src/c/URIFileToFilename.c \
-src/c/ConvertPathUnixToWindows.c \
 src/c/createdirectory.c \
 src/c/isdir.c \
 src/c/isDrive.c \
@@ -105,7 +104,6 @@ includes/gw_fileio.h \
 includes/findfiles.h \
 includes/FindFileExtension.h \
 includes/URIFileToFilename.h \
-includes/ConvertPathUnixToWindows.h \
 includes/createdirectory.h \
 includes/isdir.h \
 includes/removedir.h \
index 78dd67e..e3ab6b3 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\ConvertPathUnixToWindows.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\src\c\createdirectory.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\includes\ConvertPathUnixToWindows.h"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\includes\createdirectory.h"
                                >
                        </File>
diff --git a/scilab/modules/fileio/includes/ConvertPathUnixToWindows.h b/scilab/modules/fileio/includes/ConvertPathUnixToWindows.h
deleted file mode 100644 (file)
index 04f04ae..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - INRIA - Allan CORNET
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#ifndef __CONVERTPATHUNIXTOWINDOWS_H__
-#define __CONVERTPATHUNIXTOWINDOWS_H__
-
-#include "machine.h"
-
-/**
-* convert a unix path to windows path
-* replaces '/' by '\'
-* @param [in]
-* @param [out]
-* @return
-*/
-BOOL ConvertPathUnixToWindowsFormat(char *pathunix,char *pathwindows);
-
-#endif /* __CONVERTPATHUNIXTOWINDOWS_H__ */
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/src/c/ConvertPathUnixToWindows.c b/scilab/modules/fileio/src/c/ConvertPathUnixToWindows.c
deleted file mode 100644 (file)
index fac2a38..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - INRIA - Allan CORNET
- * ...
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "ConvertPathUnixToWindows.h"
-/*--------------------------------------------------------------------------*/
-#define UNIX_SEPATATOR '/'
-#define WINDOWS_SEPATATOR '\\'
-/*--------------------------------------------------------------------------*/
-BOOL ConvertPathUnixToWindowsFormat(char *pathunix,char *pathwindows)
-{
-       BOOL bOK=TRUE;
-       if ( (pathunix) && (pathwindows) )
-       {
-               int i=0;
-               strcpy(pathwindows,pathunix);
-               for (i=0;i<(int)strlen(pathwindows);i++)
-               {
-                       if (pathwindows[i] == UNIX_SEPATATOR) pathwindows[i] = WINDOWS_SEPATATOR;
-               }
-       }
-       else bOK=FALSE;
-
-       return bOK;
-
-}
-/*--------------------------------------------------------------------------*/
index 1d2c781..c9b0009 100644 (file)
@@ -6,3 +6,4 @@ EXPORTS
 ; scilab_windows
 ; --------------------------------------- 
        strdup_windows
+       AntislashToSlash
index f53fcb7..4585a46 100644 (file)
 
 #include "machine.h"
 #include "MALLOC.h"
+#include "EnvTclTk.h"
 #include "GlobalTclInterp.h"
-#include "../../localization/includes/localization.h"
-#include "../../fileio/includes/ConvertPathUnixToWindows.h"
+#include "localization.h"
+#include "ConvertSlash.h"
 /*--------------------------------------------------------------------------*/
-BOOL Set_TCL_LIBRARY_PATH(char *DefaultPath)
+extern void    TclSetLibraryPath(Tcl_Obj * pathPtr);
+/*--------------------------------------------------------------------------*/
+BOOL SetTclTkEnvironment(char *DefaultPath)
 {
-#define TCL_LIBRARY "TCL_LIBRARY"
-#define TCL_ENV "env"
-#define TCL_LIBRARY_FORMAT "%s\\modules\\tclsci\\tcl\\tcl%d.%d"
+       #define TCL_LIBRARY "TCL_LIBRARY"
+       #define TCL_LIBRARY_FORMAT "%s/modules/tclsci/tcl/tcl%d.%d"
+
+       #define TK_LIBRARY "TK_LIBRARY"
+       #define TK_LIBRARY_FORMAT "%s/modules/tclsci/tcl/tk%d.%d"
+
+       int tcl_major = 8;
+       int tcl_minor = 4; /* default */
+       int tcl_patchLevel = 0;
+       int tcl_type = 0;
 
-       BOOL bOK=FALSE;
-       int major = 8;
-       int minor = 4; /* default */
-       int patchLevel = 0;
-       int type = 0;
+       BOOL bOK = TRUE;
 
        char TCL_LIBRARY_PATH[PATH_MAX];
+       char TK_LIBRARY_PATH[PATH_MAX];
+       char tcl_encoding[PATH_MAX];
+       
        char ShortPath[PATH_MAX];
-       char *CopyOfDefaultPath=NULL;
+       char *CopyOfDefaultPath = NULL;
 
-       CopyOfDefaultPath = MALLOC(((int)strlen(DefaultPath)+1)*sizeof(char));
-       if (CopyOfDefaultPath == NULL)
-       {
-               return FALSE;
-       }
+       Tcl_Obj *pathPtr = NULL;
+       Tcl_Obj *objPtr = NULL;
 
-       Tcl_GetVersion(&major, &minor, &patchLevel, &type);
+       CopyOfDefaultPath = MALLOC(((int)strlen(DefaultPath)+1)*sizeof(char));
+       if (CopyOfDefaultPath == NULL) return FALSE;
 
-       /* to be sure that it's windows format */
-       /* c:\progra~1\scilab-5.0\modules\tclsci\tcl\tcl8.4 */
+       Tcl_GetVersion(&tcl_major, &tcl_minor, &tcl_patchLevel, &tcl_type);
 
-       if (GetShortPathName(DefaultPath,ShortPath,PATH_MAX)==0)
-       {
-               fprintf(stderr,"\n%s\n%s%s.\n",_("Incorrect TCL_LIBRARY environment variable"),_("TCL_LIBRARY has been redefined to "),DefaultPath);
-               ConvertPathUnixToWindowsFormat(ShortPath,CopyOfDefaultPath);
-               wsprintf (TCL_LIBRARY_PATH, TCL_LIBRARY_FORMAT,CopyOfDefaultPath,major,minor);
-       }
-       else
-       {
-               ConvertPathUnixToWindowsFormat(ShortPath,CopyOfDefaultPath);
-               wsprintf (TCL_LIBRARY_PATH, TCL_LIBRARY_FORMAT,CopyOfDefaultPath,major,minor);
-       }
+       GetShortPathName(DefaultPath,ShortPath,PATH_MAX);
+       AntislashToSlash(ShortPath,CopyOfDefaultPath);
+       sprintf (TCL_LIBRARY_PATH, TCL_LIBRARY_FORMAT,CopyOfDefaultPath,tcl_major,tcl_minor);
+       sprintf (TK_LIBRARY_PATH, TK_LIBRARY_FORMAT,CopyOfDefaultPath,tcl_major,tcl_minor);
 
        if (CopyOfDefaultPath) {FREE(CopyOfDefaultPath);CopyOfDefaultPath=NULL;}
 
-       if ( SetEnvironmentVariable(TCL_LIBRARY,TCL_LIBRARY_PATH) )
+       /* TCL_LIBRARY initialization */
+       SetEnvironmentVariable(TCL_LIBRARY,TCL_LIBRARY_PATH);
+       if (Tcl_SetVar(getTclInterp(), "tcl_library", TCL_LIBRARY_PATH, TCL_GLOBAL_ONLY) == NULL)
        {
-               if (getTclInterp() != NULL)
-               {
-                       releaseTclInterp();
-                       Tcl_SetVar2(getTclInterp(), TCL_ENV, TCL_LIBRARY, TCL_LIBRARY_PATH, TCL_GLOBAL_ONLY);
-                       bOK = TRUE;
-               }
-               else
-               {
-                       bOK = FALSE;
-               }
                releaseTclInterp();
-       }
-       else
-       {
+               fprintf(stderr,_("%s: An error occurred: %s\n"),"tcl_library",
+                       _("Impossible to set environment variable."));
                bOK = FALSE;
        }
-       return bOK;
-}
-/*--------------------------------------------------------------------------*/
-BOOL Set_TK_LIBRARY_PATH(char *DefaultPath)
-{
-#define TK_LIBRARY "TK_LIBRARY"
-#define TCL_ENV "env"
-#define TK_LIBRARY_FORMAT "%s\\modules\\tclsci\\tcl\\tk%d.%d"
-
-       BOOL bOK = FALSE;
-       char TK_LIBRARY_PATH[PATH_MAX];
-       char ShortPath[PATH_MAX];
-       char *CopyOfDefaultPath=NULL;
-
-       int major = 8;
-       int minor = 4; /* default */
-       int patchLevel = 0;
-       int type = 0;
-
-       CopyOfDefaultPath = MALLOC(((int)strlen(DefaultPath)+1)*sizeof(char));
+       releaseTclInterp();
 
-       if (CopyOfDefaultPath == NULL)
+       if (Tcl_SetVar(getTclInterp(), "tclDefaultLibrary", TCL_LIBRARY_PATH, TCL_GLOBAL_ONLY) == NULL)
        {
-               return FALSE;
+               releaseTclInterp();
+               fprintf(stderr,_("%s: An error occurred: %s\n"),"tclDefaultLibrary",
+                       _("Impossible to set environment variable."));
+               bOK = FALSE;
        }
+       releaseTclInterp();
 
-       Tcl_GetVersion(&major, &minor, &patchLevel, &type);
-
-       /* to be sure that it's windows format */
-       /* c:\progra~1\scilab-5.0\modules\tclsci\tcl\tk8.4 */
-
-       if (GetShortPathName(DefaultPath,ShortPath,PATH_MAX)==0)
+       if (Tcl_SetVar(getTclInterp(), "tcl_pkgPath", TCL_LIBRARY_PATH, TCL_GLOBAL_ONLY) == NULL)
        {
-               fprintf(stderr,"\n%s\n%s%s.\n",_("Incorrect TK_LIBRARY environment variable"),_("TK_LIBRARY has been redefined to "),DefaultPath);
-               ConvertPathUnixToWindowsFormat(ShortPath,CopyOfDefaultPath);
-               wsprintf (TK_LIBRARY_PATH, TK_LIBRARY_FORMAT,CopyOfDefaultPath,major,minor);
-       }
-       else
-       {
-               ConvertPathUnixToWindowsFormat(ShortPath,CopyOfDefaultPath);
-               wsprintf (TK_LIBRARY_PATH, TK_LIBRARY_FORMAT,CopyOfDefaultPath,major,minor);
+               releaseTclInterp();
+               fprintf(stderr,_("%s: An error occurred: %s\n"),"tcl_pkgPath",
+                       _("Impossible to set environment variable."));
+               bOK = FALSE;
        }
+       releaseTclInterp();
 
-       if (CopyOfDefaultPath) {FREE(CopyOfDefaultPath);CopyOfDefaultPath=NULL;}
+       pathPtr = Tcl_NewStringObj(TCL_LIBRARY_PATH, -1);
 
-       if ( SetEnvironmentVariable(TK_LIBRARY,TK_LIBRARY_PATH) )
+       /* TK_LIBRARY initialization */
+       SetEnvironmentVariable(TK_LIBRARY,TK_LIBRARY_PATH);
+       if (Tcl_SetVar(getTclInterp(), "tk_library", TK_LIBRARY_PATH, TCL_GLOBAL_ONLY) == NULL)
        {
-               if (getTclInterp() != NULL)
-               {
-                       releaseTclInterp();
-                       Tcl_SetVar2(getTclInterp(), TCL_ENV, TK_LIBRARY, TK_LIBRARY_PATH, TCL_GLOBAL_ONLY);
-                       bOK = TRUE;
-               }
-               else
-               {
-                       bOK = FALSE;
-               }
                releaseTclInterp();
+               fprintf(stderr,_("%s: An error occurred: %s\n"),"tk_library",
+                       _("Impossible to set environment variable."));
+               bOK = FALSE;
        }
-       else
+       releaseTclInterp();
+
+       objPtr = Tcl_NewStringObj(TK_LIBRARY_PATH, -1);
+       Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
+       TclSetLibraryPath(pathPtr);
+
+       /* encoding initialization */
+       sprintf( tcl_encoding,"cp%d", GetACP() );
+       if ( Tcl_SetSystemEncoding(NULL, tcl_encoding) == TCL_ERROR )
        {
+               fprintf(stderr,_("%s: An error occurred: %s\n"),"Tcl_SetSystemEncoding",
+                       _("Impossible to set system encoding."));
                bOK = FALSE;
        }
-       return bOK;
+
+       return bOK ;
 }
 /*--------------------------------------------------------------------------*/
index 6a86045..7ca7460 100644 (file)
 #include "BOOL.h"
 
 /**
-* Set TCL_LIBRARY environment variable on Windows
+* Set TCL_LIBRARY,TK_LIBRARY, ... environment variables on Windows
 * @param[in] scilab root path
-* @return TRUE if environment variable is correct
+* @return TRUE if environment variables are correct
 */
-BOOL Set_TCL_LIBRARY_PATH(char *DefaultPath);
-
-/**
-* Set TK_LIBRARY environment variable on Windows
-* @param[in] scilab root path
-* @return TRUE if environment variable is correct
-*/
-BOOL Set_TK_LIBRARY_PATH(char *DefaultPath);
-
+BOOL SetTclTkEnvironment(char *DefaultPath);
 #endif
 
 #endif /* __ENVTCLTK_H__ */
index 965202c..e3a7266 100644 (file)
@@ -114,8 +114,7 @@ static void *DaemonOpenTCLsci(void* in)
 #ifdef _MSC_VER
                /* Initialize TCL_LIBRARY & TK_LIBRARY variables environment */
                /* Windows only */
-               Set_TCL_LIBRARY_PATH(SciPath);
-               Set_TK_LIBRARY_PATH(SciPath);
+               SetTclTkEnvironment(SciPath);
 #endif
 
                if ( getTclInterp() == NULL )
diff --git a/scilab/modules/windows_tools/includes/ConvertSlash.h b/scilab/modules/windows_tools/includes/ConvertSlash.h
new file mode 100644 (file)
index 0000000..880baef
--- /dev/null
@@ -0,0 +1,41 @@
+/*\r
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
+ * Copyright (C) 2008 - INRIA - Allan CORNET\r
+ * \r
+ * This file must be used under the terms of the CeCILL.\r
+ * This source file is licensed as described in the file COPYING, which\r
+ * you should have received as part of this distribution.  The terms\r
+ * are also available at    \r
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
+ *\r
+ */\r
+/*--------------------------------------------------------------------------*/\r
+#ifndef __CONVERTSLASH_H__\r
+#define __CONVERTSLASH_H__\r
+\r
+#include "machine.h"\r
+\r
+\r
+/* C:\Windows\system and C:/Windows/system */\r
+/* since Windows 2000 SP2 are supported */\r
+\r
+/**\r
+* convert a unix path to windows path 'format'\r
+* replaces '/' by '\'\r
+* @param [in] path in with '/'\r
+* @param [out] path out with '\'\r
+* @return TRUE or FALSE\r
+*/\r
+BOOL slashToAntislash(char *pathunix,char *pathwindows);\r
+\r
+/**\r
+* convert a windows path to unix path 'format'\r
+* replaces '\' by '/'\r
+* @param [in] path in with '\'\r
+* @param [out] path out with '/'\r
+* @return TRUE or FALSE\r
+*/\r
+BOOL AntislashToSlash(char *pathwindows,char *pathunix);\r
+\r
+#endif /* __CONVERTSLASH_H__ */\r
+/*--------------------------------------------------------------------------*/\r
diff --git a/scilab/modules/windows_tools/src/c/scilab_windows/ConvertSlash.c b/scilab/modules/windows_tools/src/c/scilab_windows/ConvertSlash.c
new file mode 100644 (file)
index 0000000..7070c61
--- /dev/null
@@ -0,0 +1,62 @@
+/*\r
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
+ * Copyright (C) 2008 - INRIA - Allan CORNET\r
+ * \r
+ * This file must be used under the terms of the CeCILL.\r
+ * This source file is licensed as described in the file COPYING, which\r
+ * you should have received as part of this distribution.  The terms\r
+ * are also available at    \r
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
+ *\r
+ */\r
+/*--------------------------------------------------------------------------*/\r
+#include <string.h>\r
+#include "ConvertSlash.h"\r
+/*--------------------------------------------------------------------------*/\r
+#define UNIX_SEPATATOR '/'\r
+#define WINDOWS_SEPATATOR '\\'\r
+/*--------------------------------------------------------------------------*/\r
+static BOOL convertSlash(char *path_in,char *path_out,BOOL slashToAntislash);\r
+/*--------------------------------------------------------------------------*/\r
+BOOL slashToAntislash(char *pathunix,char *pathwindows)\r
+{\r
+       return convertSlash(pathwindows,pathunix,TRUE);\r
+}\r
+/*--------------------------------------------------------------------------*/\r
+BOOL AntislashToSlash(char *pathwindows,char *pathunix)\r
+{\r
+       return convertSlash(pathwindows,pathunix,FALSE);\r
+}\r
+/*--------------------------------------------------------------------------*/\r
+static BOOL convertSlash(char *path_in,char *path_out,BOOL slashToAntislash)\r
+{\r
+       BOOL bOK = FALSE;\r
+       if ( (path_in) && (path_out) )\r
+       {\r
+               int i=0;\r
+               strcpy(path_out,path_in);\r
+               for (i=0;i<(int)strlen(path_out);i++)\r
+               {\r
+                       if ( slashToAntislash )\r
+                       {\r
+                               if (path_in[i] == UNIX_SEPATATOR) \r
+                               {\r
+                                       path_out[i] = WINDOWS_SEPATATOR;\r
+                                       bOK = TRUE;\r
+                               }\r
+                       }\r
+                       else\r
+                       {\r
+                               if (path_in[i] == WINDOWS_SEPATATOR) \r
+                               {\r
+                                       path_out[i] = UNIX_SEPATATOR;\r
+                                       bOK = TRUE;\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+       else bOK = FALSE;\r
+\r
+       return bOK;\r
+}\r
+/*--------------------------------------------------------------------------*/\r
index 1c2c67e..b3213e4 100644 (file)
@@ -18,6 +18,7 @@
 #include "setgetSCIpath.h"
 #include "getScilabDirectory.h"
 #include "scilabDefaults.h"
+#include "ConvertSlash.h"
 /*--------------------------------------------------------------------------*/
 #define putenv _putenv
 /*--------------------------------------------------------------------------*/
@@ -120,24 +121,6 @@ char *GetScilabDirectory(BOOL UnixStyle)
        return SciPathName;
 }
 /*--------------------------------------------------------------------------*/
-BOOL ConvertPathWindowsToUnixFormat(char *pathwindows,char *pathunix)
-{
-       BOOL bOK=TRUE;
-       if ( (pathunix) && (pathwindows) )
-       {
-               int i=0;
-               strcpy(pathunix,pathwindows);
-               for (i=0;i<(int)strlen(pathunix);i++)
-               {
-                       if (pathunix[i]=='\\') pathunix[i]='/';
-               }
-       }
-       else bOK=FALSE;
-
-       return bOK;
-
-}
-/*--------------------------------------------------------------------------*/
 BOOL Set_SCI_PATH(char *DefaultPath)
 {
        BOOL bOK = FALSE;
@@ -151,7 +134,7 @@ BOOL Set_SCI_PATH(char *DefaultPath)
                /* to be sure that it's unix 8.3 format */
                /* c:/progra~1/scilab-5.0 */
                GetShortPathName(DefaultPath,ShortPath,PATH_MAX);
-               ConvertPathWindowsToUnixFormat(ShortPath,CopyOfDefaultPath);
+               AntislashToSlash(ShortPath,CopyOfDefaultPath);
 
                sprintf (env, "SCI=%s",ShortPath);
                setSCIpath(ShortPath);
@@ -193,7 +176,7 @@ BOOL Set_HOME_PATH(char *DefaultPath)
                        /* to be sure that it's unix format */
                        /* c:/progra~1/scilab-3.1 */
                        GetShortPathName(DefaultPath,ShortPath,PATH_MAX);
-                       ConvertPathWindowsToUnixFormat(ShortPath,CopyOfDefaultPath);
+                       slashToAntislash(ShortPath,CopyOfDefaultPath);
                        sprintf (env, "HOME=%s",ShortPath);
 
                        if (CopyOfDefaultPath) {FREE(CopyOfDefaultPath);CopyOfDefaultPath=NULL;}
@@ -203,7 +186,7 @@ BOOL Set_HOME_PATH(char *DefaultPath)
                {
                        /* to be sure that it's unix format */
                        /* c:/progra~1/scilab-3.1 */
-                       ConvertPathWindowsToUnixFormat(ShortPath,CopyOfDefaultPath);
+                       slashToAntislash(ShortPath,CopyOfDefaultPath);
                        sprintf (env, "HOME=%s",CopyOfDefaultPath);
                        if (CopyOfDefaultPath) {FREE(CopyOfDefaultPath);CopyOfDefaultPath=NULL;}
                }
@@ -216,8 +199,8 @@ BOOL Set_HOME_PATH(char *DefaultPath)
 
                /* to be sure that it's unix format */
                /* c:/progra~1/scilab-3.1 */
-               GetShortPathName(DefaultPath,ShortPath,PATH_MAX);
-               ConvertPathWindowsToUnixFormat(ShortPath,CopyOfDefaultPath);
+               AntislashToSlash(DefaultPath,CopyOfDefaultPath);
+               GetShortPathName(CopyOfDefaultPath,ShortPath,PATH_MAX);
                sprintf (env, "HOME=%s",ShortPath);
                
                if (CopyOfDefaultPath) {FREE(CopyOfDefaultPath);CopyOfDefaultPath=NULL;}
@@ -255,7 +238,7 @@ BOOL Set_SOME_ENVIRONMENTS_VARIABLES_FOR_SCILAB(void)
 
        if ( GetSystemMetrics(SM_REMOTESESSION) ) 
        {
-               _putenv ("SCILAB_MSTS_SESSION=OK");
+               putenv ("SCILAB_MSTS_SESSION=OK");
        }
 
        return bOK;
index 7014cb8..e41e178 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath=".\ConvertSlash.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\DllmainScilab_Windows.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath="..\..\..\includes\ConvertSlash.h"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\FilesAssociations.h"
                                >
                        </File>