Bug 821392: Mark pluginSupportsAsyncDXGIDrawing as 'inline' instead of 'static' to fix build warning for .cpp files that #include it without using that method. r=Bas
authorDaniel Holbert <dholbert@cs.stanford.edu>
Thu, 13 Dec 2012 15:53:03 -0800
changeset 115992 0ad5a4247d718ea85c2c5f6568dbb13548425f43
parent 115991 e66d60ed300042c010b483f554a5383690096f43
child 115993 a17cb882eb6bd663f885f7ea8c28c1279c64135c
push id19666
push userdholbert@mozilla.com
push dateThu, 13 Dec 2012 23:53:28 +0000
treeherdermozilla-inbound@0ad5a4247d71 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersBas
bugs821392
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 821392: Mark pluginSupportsAsyncDXGIDrawing as 'inline' instead of 'static' to fix build warning for .cpp files that #include it without using that method. r=Bas
dom/plugins/test/testplugin/Makefile.in
dom/plugins/test/testplugin/nptest_platform.h
--- a/dom/plugins/test/testplugin/Makefile.in
+++ b/dom/plugins/test/testplugin/Makefile.in
@@ -2,16 +2,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
+FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE       = nptest
 LIBRARY_NAME = nptest
 MODULE_NAME  = TestPlugin
 
 DIRS = secondplugin
--- a/dom/plugins/test/testplugin/nptest_platform.h
+++ b/dom/plugins/test/testplugin/nptest_platform.h
@@ -51,17 +51,17 @@ bool    pluginSupportsWindowlessMode();
 /**
  * Returns true if the plugin supports async bitmap drawing.
  */
 bool    pluginSupportsAsyncBitmapDrawing();
 
 /**
  * Returns true if the plugin supports DXGI bitmap drawing.
  */
-static bool    pluginSupportsAsyncDXGIDrawing()
+inline bool    pluginSupportsAsyncDXGIDrawing()
 {
 #ifdef XP_WIN
   return true;
 #else
   return false;
 #endif
 }