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

trunk/dll/draglist.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2008 Steven H.Levine
+  Copyright (c) 2001, 2010 Steven H.Levine
 
   16 Oct 02 SHL DoFileDrag: don't free stack
@@ -25 +25 @@
   12 Sep 09 GKY Fix (probably spurrious) error message generated on drag of
                 items from a pmmail mail message (PMERR_INVALID_PARAMETER)
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -183 +184 @@
       DItem.ulItemID = 1;
       DItem.hstrType = DrgAddStrHandle(DRT_UNKNOWN);
-      DItem.hstrRMF = DrgAddStrHandle(DRMDRFLIST);
+      DItem.hstrRMF = DrgAddStrHandle((CHAR *) DRMDRFLIST);
       DItem.hstrContainerName = DrgAddStrHandle(szDir);
       DItem.hstrSourceName = DrgAddStrHandle(szFile);
@@ -364 +365 @@
       pDItem->hstrType = DrgAddStrHandle(DRT_UNKNOWN);
       ok = pDItem->hstrType;
-      pDItem->hstrRMF = DrgAddStrHandle(DRMDRFLIST);
+      pDItem->hstrRMF = DrgAddStrHandle((CHAR *) DRMDRFLIST);
       ok = ok && pDItem->hstrRMF;
       pDItem->hstrContainerName = DrgAddStrHandle(szBuffer);
@@ -440 +441 @@
       pDItem->hstrType = DrgAddStrHandle(DRT_UNKNOWN);
       ok = pDItem->hstrType;
-      pDItem->hstrRMF = DrgAddStrHandle(DRMDRFOS2FILE);
+      pDItem->hstrRMF = DrgAddStrHandle((CHAR *) DRMDRFOS2FILE);
       ok = ok && pDItem->hstrRMF;
       pDItem->hstrContainerName = DrgAddStrHandle(arcfile);
@@ -479 +480 @@
         pDItem->hstrType = DrgAddStrHandle(DRT_UNKNOWN);
         ok = ok && pDItem->hstrType;
-        pDItem->hstrRMF = DrgAddStrHandle(DRMDRFFM2ARC);
+        pDItem->hstrRMF = DrgAddStrHandle((CHAR *) DRMDRFFM2ARC);
         ok = ok && pDItem->hstrRMF;
         pDItem->hstrContainerName = DrgAddStrHandle(arcfile);
@@ -691 +692 @@
       pDItem->hstrType = DrgAddStrHandle(DRT_UNKNOWN);
       ok = pDItem->hstrType;
-      pDItem->hstrRMF = DrgAddStrHandle(DRMDRFLIST);
+      pDItem->hstrRMF = DrgAddStrHandle((CHAR *) DRMDRFLIST);
       ok = ok && pDItem->hstrRMF;
       pDItem->hstrContainerName = DrgAddStrHandle(szBuffer);