From 00f8d8614fb6ad8e84f78c97c77c6ce85118756e Mon Sep 17 00:00:00 2001 From: "michaelp%netscape.com" Date: Sun, 27 Sep 1998 22:35:54 +0000 Subject: [PATCH] now supports direct draw using MSVC 5.0. git-svn-id: svn://10.0.0.236/trunk@11189 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/src/windows/makefile.win | 5 ----- mozilla/gfx/src/windows/nsRenderingContextWin.cpp | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mozilla/gfx/src/windows/makefile.win b/mozilla/gfx/src/windows/makefile.win index 3850215a544..3de172d33a5 100644 --- a/mozilla/gfx/src/windows/makefile.win +++ b/mozilla/gfx/src/windows/makefile.win @@ -72,11 +72,6 @@ LLIBS= \ !if defined(NGLAYOUT_DDRAW) ole32.lib \ $(NGLAYOUT_DDRAW)\lib\ddraw.lib \ -!if "$(MOZ_VCVER)" == "50" - $(NGLAYOUT_DDRAW)\lib\uuid.lib \ -!else - $(NGLAYOUT_DDRAW)\lib\dxguid.lib \ -!endif !endif $(LIBNSPR) diff --git a/mozilla/gfx/src/windows/nsRenderingContextWin.cpp b/mozilla/gfx/src/windows/nsRenderingContextWin.cpp index ea78e016323..d1b7e5e939a 100644 --- a/mozilla/gfx/src/windows/nsRenderingContextWin.cpp +++ b/mozilla/gfx/src/windows/nsRenderingContextWin.cpp @@ -16,6 +16,10 @@ * Reserved. */ +#ifdef NGLAYOUT_DDRAW +#define INITGUID +#endif + #include "nsRenderingContextWin.h" #include "nsRegionWin.h" #include