Changeset 1498 for trunk/dll/arccnrs.c


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/arccnrs.c

    r1497 r1498  
    77
    88  Copyright (c) 1993-98 M. Kimes
    9   Copyright (c) 2001, 2009 Steven H. Levine
     9  Copyright (c) 2001, 2010 Steven H. Levine
    1010
    1111  11 Jun 02 SHL Ensure archive name not garbage
    … …  
    8181                aren't user settable; realappname should be used for setting applicable to
    8282                one or more miniapp but not to FM/2
     83  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
    8384
    8485***********************************************************************/
    … …  
    8788#include <string.h>
    8889#include <ctype.h>
    89 #include <direct.h>                     // rmdir
     90#include <direct.h>                     // rmdir
    9091#include <share.h>                      // SH_DENYWR
    9192#include <limits.h>                     // ULONG_MAX
    … …  
    32543255                                       0);      /* Index to DRAGITEM */
    32553256          if (DrgVerifyRMF(pDItem,      /* Check valid rendering */
    3256                            DRM_OS2FILE, /* mechanisms and data */
     3257                           (CHAR *) DRM_OS2FILE,        /* mechanisms and data */
    32573258                           NULL) && !(pDItem->fsControl & DC_PREPARE)) {
    32583259            DrgFreeDraginfo(pDInfo);    /* Free DRAGINFO */
    … …  
    32783279              if (!ParentIsDesktop(hwnd, dcd->hwndParent) &&
    32793280                  fSplitStatus && hwndStatus2)
    3280                 WinSetWindowText(hwndStatus2, GetPString(IDS_DRAGARCMEMTEXT));
     3281                WinSetWindowText(hwndStatus2, (CHAR *) GetPString(IDS_DRAGARCMEMTEXT));
    32813282              if (DoFileDrag(hwnd,
    32823283                             dcd->hwndObject,
    … …  
    32943295                  fSplitStatus && hwndStatus2)
    32953296                WinSetWindowText(hwndStatus2,
    3296                                  GetPString(IDS_DRAGARCFILETEXT));
     3297                                 (CHAR *) GetPString(IDS_DRAGARCFILETEXT));
    32973298              DragOne(hwnd, dcd->hwndObject, dcd->arcname, FALSE);
    32983299              if (!ParentIsDesktop(hwnd, dcd->hwndParent) &&
    … …  
    36383639                                   WS_VISIBLE,
    36393640                                   &FrameFlags,
    3640                                    WC_ARCCONTAINER,
     3641                                   (CHAR *) WC_ARCCONTAINER,
    36413642                                   title,
    36423643                                   WS_VISIBLE | fwsAnimate,
Note: See TracChangeset for help on using the changeset viewer.