Skip to content

Commit 714c31f

Browse files
jimevansjimevans
committed
Reversing condition of previous commit
Changing the ifdef to be for Gecko versions < 31 rather than >= 31. This means that eventually the #ifdef can be rolled out as versions of Gecko progress.
1 parent 62ca578 commit 714c31f

9 files changed

+31
-28
lines changed

‎cpp/webdriver-firefox/native_events.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ void notify_of_close_window(PRInt32 windowId);
5353
#endif
5454
#endif // BUILD_ON_UNIX
5555

56-
#ifdef WEBDRIVER_GECKO_VAR_ARGS_ISUPPORTS
57-
NS_IMPL_ISUPPORTS(nsNativeEvents, nsINativeEvents)
58-
#else
56+
#ifdef WEBDRIVER_GECKO_USES_ISUPPORTS1
5957
NS_IMPL_ISUPPORTS1(nsNativeEvents, nsINativeEvents)
58+
#else
59+
NS_IMPL_ISUPPORTS(nsNativeEvents, nsINativeEvents)
6060
#endif
6161

6262
nsNativeEvents::nsNativeEvents()

‎cpp/webdriver-firefox/native_ime.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
#include <nsStringAPI.h>
5151
#include <algorithm>
5252

53-
#ifdef WEBDRIVER_GECKO_VAR_ARGS_ISUPPORTS
54-
NS_IMPL_ISUPPORTS(nsNativeIME, nsINativeIME)
55-
#else
53+
#ifdef WEBDRIVER_GECKO_USES_ISUPPORTS1
5654
NS_IMPL_ISUPPORTS1(nsNativeIME, nsINativeIME)
55+
#else
56+
NS_IMPL_ISUPPORTS(nsNativeIME, nsINativeIME)
5757
#endif
5858

5959
nsNativeIME::nsNativeIME()

‎cpp/webdriver-firefox/native_keyboard.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
#define WD_RESULT int
4141
#endif
4242

43-
#ifdef WEBDRIVER_GECKO_VAR_ARGS_ISUPPORTS
44-
NS_IMPL_ISUPPORTS(nsNativeKeyboard, nsINativeKeyboard)
45-
#else
43+
#ifdef WEBDRIVER_GECKO_USES_ISUPPORTS1
4644
NS_IMPL_ISUPPORTS1(nsNativeKeyboard, nsINativeKeyboard)
45+
#else
46+
NS_IMPL_ISUPPORTS(nsNativeKeyboard, nsINativeKeyboard)
4747
#endif
4848

4949
nsNativeKeyboard::nsNativeKeyboard()

‎cpp/webdriver-firefox/native_mouse.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
#define WD_RESULT int
4040
#endif
4141

42-
#ifdef WEBDRIVER_GECKO_VAR_ARGS_ISUPPORTS
43-
NS_IMPL_ISUPPORTS(nsNativeMouse, nsINativeMouse)
44-
#else
42+
#ifdef WEBDRIVER_GECKO_USES_ISUPPORTS1
4543
NS_IMPL_ISUPPORTS1(nsNativeMouse, nsINativeMouse)
44+
#else
45+
NS_IMPL_ISUPPORTS(nsNativeMouse, nsINativeMouse)
4646
#endif
4747

4848
nsNativeMouse::nsNativeMouse()

‎cpp/webdriver-firefox/webdriver-firefox-esr-latest.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<ClCompile>
9494
<Optimization>Disabled</Optimization>
9595
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-24\win32\include;$(ProjectDir)..\..\third_party\gecko-24\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
96-
<PreprocessorDefinitions>WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
96+
<PreprocessorDefinitions>WEBDRIVER_GECKO_USES_ISUPPORTS1;WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9797
<MinimalRebuild>true</MinimalRebuild>
9898
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
9999
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -114,7 +114,7 @@
114114
<ClCompile>
115115
<Optimization>Disabled</Optimization>
116116
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-24\win32\include;$(ProjectDir)..\..\third_party\gecko-24\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
117-
<PreprocessorDefinitions>WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117+
<PreprocessorDefinitions>WEBDRIVER_GECKO_USES_ISUPPORTS1;WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118118
<MinimalRebuild>true</MinimalRebuild>
119119
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
120120
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -133,7 +133,7 @@
133133
<Optimization>MaxSpeed</Optimization>
134134
<IntrinsicFunctions>true</IntrinsicFunctions>
135135
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-24\win32\include;$(ProjectDir)..\..\third_party\gecko-24\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
136-
<PreprocessorDefinitions>WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136+
<PreprocessorDefinitions>WEBDRIVER_GECKO_USES_ISUPPORTS1;WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137137
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
138138
<FunctionLevelLinking>true</FunctionLevelLinking>
139139
<WarningLevel>Level3</WarningLevel>
@@ -157,7 +157,7 @@
157157
<Optimization>MaxSpeed</Optimization>
158158
<IntrinsicFunctions>true</IntrinsicFunctions>
159159
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-24\win32\include;$(ProjectDir)..\..\third_party\gecko-24\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
160-
<PreprocessorDefinitions>WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
160+
<PreprocessorDefinitions>WEBDRIVER_GECKO_USES_ISUPPORTS1;WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
161161
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
162162
<FunctionLevelLinking>true</FunctionLevelLinking>
163163
<WarningLevel>Level3</WarningLevel>

‎cpp/webdriver-firefox/webdriver-firefox-esr-previous.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<ClCompile>
9494
<Optimization>Disabled</Optimization>
9595
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-17\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
96-
<PreprocessorDefinitions>WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
96+
<PreprocessorDefinitions>WEBDRIVER_GECKO_USES_ISUPPORTS1;WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9797
<MinimalRebuild>true</MinimalRebuild>
9898
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
9999
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -114,7 +114,7 @@
114114
<ClCompile>
115115
<Optimization>Disabled</Optimization>
116116
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-17\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
117-
<PreprocessorDefinitions>WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117+
<PreprocessorDefinitions>WEBDRIVER_GECKO_USES_ISUPPORTS1;WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118118
<MinimalRebuild>true</MinimalRebuild>
119119
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
120120
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -133,7 +133,7 @@
133133
<Optimization>MaxSpeed</Optimization>
134134
<IntrinsicFunctions>true</IntrinsicFunctions>
135135
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-17\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
136-
<PreprocessorDefinitions>WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136+
<PreprocessorDefinitions>WEBDRIVER_GECKO_USES_ISUPPORTS1;WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137137
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
138138
<FunctionLevelLinking>true</FunctionLevelLinking>
139139
<WarningLevel>Level3</WarningLevel>
@@ -157,7 +157,7 @@
157157
<Optimization>MaxSpeed</Optimization>
158158
<IntrinsicFunctions>true</IntrinsicFunctions>
159159
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-17\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
160-
<PreprocessorDefinitions>WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
160+
<PreprocessorDefinitions>WEBDRIVER_GECKO_USES_ISUPPORTS1;WEBDRIVER_LEGACY_GECKO;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
161161
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
162162
<FunctionLevelLinking>true</FunctionLevelLinking>
163163
<WarningLevel>Level3</WarningLevel>

‎cpp/webdriver-firefox/webdriver-firefox-latest.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<ClCompile>
9393
<Optimization>Disabled</Optimization>
9494
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-31\win32\include;$(ProjectDir)..\..\third_party\gecko-31\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
95-
<PreprocessorDefinitions>WEBDRIVER_GECKO_VAR_ARGS_ISUPPORTS;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95+
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9696
<MinimalRebuild>true</MinimalRebuild>
9797
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
9898
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -113,7 +113,7 @@
113113
<ClCompile>
114114
<Optimization>Disabled</Optimization>
115115
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-31\win32\include;$(ProjectDir)..\..\third_party\gecko-31\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
116-
<PreprocessorDefinitions>WEBDRIVER_GECKO_VAR_ARGS_ISUPPORTS;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
116+
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117117
<MinimalRebuild>true</MinimalRebuild>
118118
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
119119
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -132,7 +132,7 @@
132132
<Optimization>MaxSpeed</Optimization>
133133
<IntrinsicFunctions>true</IntrinsicFunctions>
134134
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-31\win32\include;$(ProjectDir)..\..\third_party\gecko-31\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
135-
<PreprocessorDefinitions>WEBDRIVER_GECKO_VAR_ARGS_ISUPPORTS;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135+
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136136
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
137137
<FunctionLevelLinking>true</FunctionLevelLinking>
138138
<WarningLevel>Level3</WarningLevel>
@@ -156,7 +156,7 @@
156156
<Optimization>MaxSpeed</Optimization>
157157
<IntrinsicFunctions>true</IntrinsicFunctions>
158158
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-31\win32\include;$(ProjectDir)..\..\third_party\gecko-31\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
159-
<PreprocessorDefinitions>WEBDRIVER_GECKO_VAR_ARGS_ISUPPORTS;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
159+
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
160160
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
161161
<FunctionLevelLinking>true</FunctionLevelLinking>
162162
<WarningLevel>Level3</WarningLevel>

‎cpp/webdriver-firefox/webdriver-firefox-previous.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<ClCompile>
9393
<Optimization>Disabled</Optimization>
9494
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-30\win32\include;$(ProjectDir)..\..\third_party\gecko-30\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
95-
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95+
<PreprocessorDefinitions>WEBDRIVER_GECKO_USES_ISUPPORTS1;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9696
<MinimalRebuild>true</MinimalRebuild>
9797
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
9898
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -113,7 +113,7 @@
113113
<ClCompile>
114114
<Optimization>Disabled</Optimization>
115115
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-30\win32\include;$(ProjectDir)..\..\third_party\gecko-30\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
116-
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
116+
<PreprocessorDefinitions>WEBDRIVER_GECKO_USES_ISUPPORTS1;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117117
<MinimalRebuild>true</MinimalRebuild>
118118
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
119119
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -132,7 +132,7 @@
132132
<Optimization>MaxSpeed</Optimization>
133133
<IntrinsicFunctions>true</IntrinsicFunctions>
134134
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-30\win32\include;$(ProjectDir)..\..\third_party\gecko-30\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
135-
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135+
<PreprocessorDefinitions>WEBDRIVER_GECKO_USES_ISUPPORTS1;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136136
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
137137
<FunctionLevelLinking>true</FunctionLevelLinking>
138138
<WarningLevel>Level3</WarningLevel>
@@ -156,7 +156,7 @@
156156
<Optimization>MaxSpeed</Optimization>
157157
<IntrinsicFunctions>true</IntrinsicFunctions>
158158
<AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-30\win32\include;$(ProjectDir)..\..\third_party\gecko-30\win32\include\nspr;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
159-
<PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
159+
<PreprocessorDefinitions>WEBDRIVER_GECKO_USES_ISUPPORTS1;XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
160160
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
161161
<FunctionLevelLinking>true</FunctionLevelLinking>
162162
<WarningLevel>Level3</WarningLevel>

‎rake-tasks/crazy_fun/mappings/gcc.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,9 @@ def handle(fun, dir, args)
219219
if (args[:geckoversion].to_i < 29)
220220
base_compiler_args += " -DWEBDRIVER_LEGACY_GECKO"
221221
end
222+
if (args[:geckoversion].to_i < 31)
223+
base_compiler_args += " -DWEBDRIVER_GECKO_USES_ISUPPORTS1"
224+
end
222225
compiler_args = [args[:args], base_compiler_args].join " "
223226
if (args[:geckoversion].to_i < 22)
224227
linker_args = "-Wall -fshort-wchar -fno-rtti -fno-exceptions -shared -fPIC -L#{gecko_sdk}lib -L#{gecko_sdk}bin -Wl,-rpath-link,#{gecko_sdk}bin -l#{xpcom_lib} -lxpcom -lnspr4 -lrt `pkg-config gtk+-2.0 --libs`"

0 commit comments

Comments
 (0)