# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1321635049 0
# Node ID 324812debcc967f47344f8a88eb2f33acfa428da
# Parent  32a5be18e18785e3b276a18c26e42bf7d712075f
Missed a couple .DEF file references on OS/2 and...
Fixed a warning reported by gcc with the set-focus top-level window fix.

diff -r 32a5be18e187 -r 324812debcc9 makefile.emx
--- a/makefile.emx	Fri Nov 18 16:45:22 2011 +0000
+++ b/makefile.emx	Fri Nov 18 16:50:49 2011 +0000
@@ -26,7 +26,7 @@
 
 all: dw.dll dwcompat.dll dwtest.exe
 
-dw.dll:  os2\dw.c dw.def
+dw.dll:  os2\dw.c os2\dw.def
 	$(CC) $(CFLAGS) $(DEFS) -o dw.dll os2/dw.c $(LDFLAGS) os2/dw.def
 
 dw.lib: os2\dw.def
diff -r 32a5be18e187 -r 324812debcc9 makefile.vac
--- a/makefile.vac	Fri Nov 18 16:45:22 2011 +0000
+++ b/makefile.vac	Fri Nov 18 16:50:49 2011 +0000
@@ -21,7 +21,7 @@
    so32dll.lib
    tcp32dll.lib
 <<
-  IMPLIB DW.LIB DW.DEF
+  IMPLIB DW.LIB OS2\DW.DEF
   copy dw.lib lib\dw.lib
   copy dw.dll dll\dw.dll
 
@@ -37,7 +37,7 @@
    so32dll.lib
    tcp32dll.lib
 <<
-  IMPLIB DWCOMPAT.LIB DWCOMPAT.DEF
+  IMPLIB DWCOMPAT.LIB OS2\DWCOMPAT.DEF
   copy dwcompat.lib lib\dwcompat.lib
   copy dwcompat.dll dll\dwcompat.dll
 
diff -r 32a5be18e187 -r 324812debcc9 os2/dw.c
--- a/os2/dw.c	Fri Nov 18 16:45:22 2011 +0000
+++ b/os2/dw.c	Fri Nov 18 16:50:49 2011 +0000
@@ -3137,7 +3137,7 @@
       command_active = 1;
 
       if(msg == WM_ACTIVATE)
-          result = (int)_run_event(mp2, WM_SETFOCUS, 0, mp1);
+          result = (int)_run_event((HWND)mp2, WM_SETFOCUS, 0, mp1);
       else
           result = (int)_run_event(hWnd, msg, mp1, mp2);