Changeset 696 for trunk/dll

Timestamp:

Jun 17, 2007, 5:21:18 AM (18 years ago)

Author:

Steven Levine

Message:

More OpenWatcom compatibility updates

Location:

trunk/dll

Files:

• arccnrs.c (modified) (2 diffs)
• fm3dll.h (modified) (2 diffs)
• internal/makefile (modified) (2 diffs)
• makefile (modified) (1 diff)

trunk/dll/arccnrs.c

@@ -39 +39 @@
   12 May 07 SHL Use dcd->ulItemsToUnHilite; sync with UnHilite arg mods
   10 Jun 07 GKY Add CheckPmDrgLimit including IsFm2Window as part of work around PM drag limit
+  16 Jun 07 SHL Use DosQueryAppType not DosQAppType
 
 ***********************************************************************/
@@ -386 +387 @@
       *p = 0;
     DosError(FERR_DISABLEHARDERR);
-    if (!DosQAppType(s, &apptype) &&
+    if (!DosQueryAppType(s, &apptype) &&
         (apptype & FAPPTYP_DOS ||
          apptype & FAPPTYP_WINDOWSREAL ||

trunk/dll/fm3dll.h

@@ -49 +49 @@
   05 Jun 07 SHL Update for OpenWatcom
   10 Jun 07 GKY Add CheckPmDrgLimit including IsFm2Window as part of work around PM drag limit
+  16 Jun 07 GKY Add CheckPmDrgLimit including IsFm2Window as part of work around PM drag limit
+  16 Jun 07 SHL Update more for OpenWatcom
 
 ***********************************************************************/
@@ -104 +106 @@
 #define BKS_MERLINSTYLE   0x0800
 #endif
-#ifndef PMBITMAP_INCLUDED
+#if !defined(PMBITMAP_INCLUDED) && !defined(INCL_GPIINCLUDED)
 typedef struct _RGB2            /* rgb2 */
 {

trunk/dll/internal/makefile

@@ -10 +10 @@
 !include ..\..\makefile_pre.mk
 
-# CFLAGS = /G5 /Gm+ /Gs- /Gt- /IDLL /Mp /O- /Q+     /Sp4 /Ss /Ti+ /W3
-# CFLAGS = /G5 /Gm+ /Gs- /Gt-       /Mp /O+ /Q+ /Sm      /Ss /W3
 # -bc           console app
 # -bm           multithread libs
@@ -53 +51 @@
    @%write $^@ option map
    @%write $^@ name $(BASE)
-   @%write $^@ op desc '@$#$(%VENDOR):$(%BUILDVER)$#@$#$#1$#$# $(%BUILDTIME)      slamain::EN:US:0:U:@@Fm/2 Strings Compiler'
+   @%write $^@ op desc '@$#SLAInc:3.05.09$#@$#$#1$#$# 06/15/2007 03:05:09      slamain::EN:US:0:U:@@Fm/2 Strings Compiler'
    @%write $^@ file $(BASE).obj
    @%write $^@ library os2386.lib

trunk/dll/makefile

@@ -76 +76 @@
 
 !ifdef %DEBUG
-CFLAGS =   -bt=os2 -mf -bd -bm -d1 -olirs   -s -j -wx -zfp -zgp -zq -hd
-!else
-CFLAGS =   -bt=os2 -mf -bd -bm -d1 -olirs   -s -j -wx -zfp -zgp -zq -hd
+CFLAGS =   -bt=os2 -mf -bd -bm -d1 -olirs   -s -sg -j -wx -zfp -zgp -zq -hd
+!else
+CFLAGS =   -bt=os2 -mf -bd -bm -d1 -olirs   -s -sg -j -wx -zfp -zgp -zq -hd
 !endif