Changeset 1498 for trunk/dll/archive.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/archive.c (modified) (5 diffs)

trunk/dll/archive.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2008 Steven H.Levine
+  Copyright (c) 2004, 2010 Steven H.Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -15 +15 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -93 +94 @@
       if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
         WinSetDlgItemText(hwnd, ARCH_HELP,
-                          GetPString(IDS_ARCDEFAULTHELPTEXT));
+                          (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
         WinSetDlgItemText(hwnd, ARCH_HELP,
-                          GetPString(IDS_ARCARCNAMEHELPTEXT));
+                          (CHAR *) GetPString(IDS_ARCARCNAMEHELPTEXT));
       break;
 
@@ -102 +103 @@
       if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
         WinSetDlgItemText(hwnd, ARCH_HELP,
-                          GetPString(IDS_ARCDEFAULTHELPTEXT));
+                          (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
-        WinSetDlgItemText(hwnd, ARCH_HELP, GetPString(IDS_ARCCMDHELPTEXT));
+        WinSetDlgItemText(hwnd, ARCH_HELP, (CHAR *) GetPString(IDS_ARCCMDHELPTEXT));
       break;
 
@@ -110 +111 @@
       if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
         WinSetDlgItemText(hwnd, ARCH_HELP,
-                          GetPString(IDS_ARCDEFAULTHELPTEXT));
+                          (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
-        WinSetDlgItemText(hwnd, ARCH_HELP, GetPString(IDS_ARCMASKHELPTEXT));
+        WinSetDlgItemText(hwnd, ARCH_HELP, (CHAR *) GetPString(IDS_ARCMASKHELPTEXT));
 
       break;