Backed out changeset 07f3cfaa7900 (bug 958596) for build failures on Windows

configure.in

@@ -7719,7 +7719,6 @@ XPCOM_LIBS="$LIBXUL_LIBS"
 
 if test "$OS_ARCH" = "WINNT"; then
   GKMEDIAS_SHARED_LIBRARY=1
-  AC_DEFINE(GKMEDIAS_SHARED_LIBRARY)
 fi
 AC_SUBST(GKMEDIAS_SHARED_LIBRARY)
 

gfx/2d/Factory.cpp

@@ -53,7 +53,7 @@
 
 #include "mozilla/CheckedInt.h"
 
-#if defined(DEBUG) || defined(PR_LOGGING)
+#ifdef PR_LOGGING
 PRLogModuleInfo *
 GetGFX2DLog()
 {
@@ -156,7 +156,7 @@ namespace mozilla {
 namespace gfx {
 
 // XXX - Need to define an API to set this.
-GFX2D_API int sGfxLogLevel = LOG_DEBUG;
+int sGfxLogLevel = LOG_DEBUG;
 
 #ifdef WIN32
 ID3D10Device1 *Factory::mD3D10Device;

gfx/2d/Logging.h

@@ -14,17 +14,10 @@
 #include "Matrix.h"
 
 #ifdef WIN32
-// This file gets included from nsGlobalWindow.cpp, which doesn't like
-// having windows.h included in it. Since OutputDebugStringA is the only
-// thing we need from windows.h, we just declare it here directly.
-// Note: the function's documented signature is
-//  WINBASEAPI void WINAPI OutputDebugStringA(LPCSTR lpOutputString)
-// but if we don't include windows.h, the macros WINBASEAPI, WINAPI, and 
-// LPCSTR are not defined, so we need to replace them with their expansions.
-extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(const char* lpOutputString);
+#include <windows.h>
 #endif
 
-#if defined(DEBUG) || defined(PR_LOGGING)
+#ifdef PR_LOGGING
 #include <prlog.h>
 
 extern PRLogModuleInfo *GetGFX2DLog();
@@ -36,7 +29,7 @@ namespace gfx {
 const int LOG_DEBUG = 1;
 const int LOG_WARNING = 2;
 
-#if defined(DEBUG) || defined(PR_LOGGING)
+#ifdef PR_LOGGING
 
 inline PRLogModuleLevel PRLogLevelForLevel(int aLevel) {
   switch (aLevel) {
@@ -50,7 +43,7 @@ inline PRLogModuleLevel PRLogLevelForLevel(int aLevel) {
 
 #endif
 
-extern GFX2D_API int sGfxLogLevel;
+extern int sGfxLogLevel;
 
 static inline void OutputMessage(const std::string &aString, int aLevel) {
 #if defined(WIN32) && !defined(PR_LOGGING)

gfx/2d/Rect.h

@@ -97,7 +97,7 @@ struct RectTyped :
         Super(float(rect.x), float(rect.y),
               float(rect.width), float(rect.height)) {}
 
-    void NudgeToIntegers()
+    GFX2D_API void NudgeToIntegers()
     {
       NudgeToInteger(&(this->x));
       NudgeToInteger(&(this->y));

gfx/2d/Types.h

@@ -246,7 +246,7 @@ struct GradientStop
 }
 }
 
-#if defined(XP_WIN) && defined(GKMEDIAS_SHARED_LIBRARY)
+#if defined(XP_WIN) && defined(MOZ_GFX)
 #ifdef GFX2D_INTERNAL
 #define GFX2D_API __declspec(dllexport)
 #else

gfx/2d/moz.build

@@ -21,7 +21,6 @@ EXPORTS.mozilla.gfx += [
     'DataSurfaceHelpers.h',
     'Filters.h',
     'Helpers.h',
-    'Logging.h',
     'Matrix.h',
     'PathHelpers.h',
     'Point.h',