Bug 1004642: Fix compiler warning in TestUDPSocket.cpp, r=jduell
authorBrian Smith <brian@briansmith.org>
Thu, 01 May 2014 14:35:17 -0700
changeset 181294 11de3d4530bea20a0ffcb3e784b591e35b52f821
parent 181293 8e706d0a419355d9f1c30cb0e57eada8c5491a79
child 181295 71110537b22f9f0a97f392e525ba53128aed38f3
push id26699
push usercbook@mozilla.com
push dateFri, 02 May 2014 12:30:59 +0000
treeherdermozilla-central@66ea09d0c951 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjduell
bugs1004642
milestone32.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 1004642: Fix compiler warning in TestUDPSocket.cpp, r=jduell
netwerk/test/TestUDPSocket.cpp
--- a/netwerk/test/TestUDPSocket.cpp
+++ b/netwerk/test/TestUDPSocket.cpp
@@ -325,17 +325,20 @@ main(int32_t argc, char *argv[])
   nsCOMPtr<MulticastTimerCallback> timerCb = new MulticastTimerCallback();
 
   // The following multicast tests using multiple sockets require a firewall
   // exception on Windows XP before they pass.  For now, we'll skip them here.
   // Later versions of Windows don't seem to have this issue.
 #ifdef XP_WIN
   OSVERSIONINFO OsVersion;
   OsVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+#pragma warning(push)
+#pragma warning(disable:4996) // 'GetVersionExA': was declared deprecated
   GetVersionEx(&OsVersion);
+#pragma warning(pop)
   if (OsVersion.dwMajorVersion == 5 && OsVersion.dwMinorVersion == 1) {
     goto close;
   }
 #endif
 
   // Join multicast group
   printf("Joining multicast group\n");
   phase = TEST_MULTICAST;