Changeset 1498 for trunk/dll/srchpath.c

Timestamp:

Jan 18, 2010, 1:57:01 AM (16 years ago)

Author:

Gregg Young

Message:

Changes to get FM2 to compile with the latest watcom 1.9 beta (mostly type casts of CHAR CONSTANT * to CHAR *). Changes to get the environment settings working everywhere again (broken by the change that moved commands to the INI); Added an environment size variable (set to 2048 which was the largest I found hard coded). Still need to find everywhere the environment size is set and use this variable.

File:

• trunk/dll/srchpath.c (modified) (5 diffs)

trunk/dll/srchpath.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2008 Steven H. Levine
+  Copyright (c) 2003, 2010 Steven H. Levine
 
   22 Apr 07 GKY Add RunFM2Util to find and run apps from the FM2Utilities
@@ -13 +13 @@
   23 Aug 07 SHL Comments
   04 Oct 08 JBS Make searchapath non-static
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -48 +49 @@
 
     rc = DosSearchPath(SEARCH_IGNORENETERRS |SEARCH_ENVIRONMENT |
-                       SEARCH_CUR_DIRECTORY, PCSZ_PATH,
-                       appname, (PBYTE)fbuf, CCHMAXPATH - 1);
+                       SEARCH_CUR_DIRECTORY, (CHAR *) PCSZ_PATH,
+                       (CHAR *) appname, (PBYTE)fbuf, CCHMAXPATH - 1);
       if (rc != 0) {
         if (rc != 2){
@@ -58 +59 @@
         else {
         rc = DosSearchPath(0, "UTILS;..\\FM2Utils",
-                           appname, (PBYTE)fbuf, CCHMAXPATH - 1);
+                           (CHAR *) appname, (PBYTE)fbuf, CCHMAXPATH - 1);
             if (rc != 0 && rc != 2){
               Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -123 +124 @@
   if (DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT |
                     SEARCH_CUR_DIRECTORY,
-                    pathvar, filename, (PBYTE)fbuf, CCHMAXPATH - 1))
+                    (CHAR *) pathvar, (CHAR *) filename, (PBYTE)fbuf, CCHMAXPATH - 1))
     *fbuf = 0;
   return fbuf;