[ros-diffs] Integrated change by gvg in revision 12551

[gvg at svn.reactos.com]

Import and merge Wine-20041201
Added: trunk/reactos/lib/mpr/
Added: trunk/reactos/lib/mpr/Makefile
Added: trunk/reactos/lib/mpr/Makefile.ros-template
Modified: trunk/reactos/lib/mpr/wnet.c
  _____  

Copied: trunk/reactos/lib/mpr (from rev 12550,
vendor/wine/dlls/mpr/current)
  _____  

Added: trunk/reactos/lib/mpr/Makefile
--- vendor/wine/dlls/mpr/current/Makefile	2004-12-31 15:05:54 UTC
(rev 12550)
+++ trunk/reactos/lib/mpr/Makefile	2004-12-31 15:06:50 UTC (rev
12551)
@@ -0,0 +1,9 @@

+# $Id: Makefile 7970 2004-02-01 19:48:44Z gvg $
+
+PATH_TO_TOP = ../..
+
+TARGET_TYPE = winedll
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
  _____  

Added: trunk/reactos/lib/mpr/Makefile.ros-template
--- vendor/wine/dlls/mpr/current/Makefile.ros-template	2004-12-31
15:05:54 UTC (rev 12550)
+++ trunk/reactos/lib/mpr/Makefile.ros-template	2004-12-31 15:06:50 UTC
(rev 12551)
@@ -0,0 +1,17 @@

+# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $
+
+TARGET_NAME = mpr
+
+TARGET_OBJECTS = @C_SRCS@
+
+TARGET_CFLAGS = -D__REACTOS__
+
+TARGET_SDKLIBS = @IMPORTS@ kernel32.a wine.a ntdll.a
+
+TARGET_BASE = $(TARGET_BASE_LIB_MPR)
+
+default: all
+
+DEP_OBJECTS = $(TARGET_OBJECTS)
+
+include $(TOOLS_PATH)/depend.mk
  _____  

Modified: trunk/reactos/lib/mpr/wnet.c
--- vendor/wine/dlls/mpr/current/wnet.c	2004-12-31 15:05:54 UTC (rev
12550)
+++ trunk/reactos/lib/mpr/wnet.c	2004-12-31 15:06:50 UTC (rev
12551)
@@ -22,6 +22,7 @@

 #include <stdarg.h>
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "winnls.h"
 #include "winnetwk.h"
 #include "npapi.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20041231/3088d15a/attachment.html