Bug 1014626 - Fix Windows 64 build break
authorAnthony Jones <ajones@mozilla.com>
Mon, 26 May 2014 15:52:01 +1200
changeset 184878 ceac4ecc8b04490778f7412eb2792fc2cf6f6445
parent 184877 f7e220ce03aa546d9e968cb87a6c9f32daac92d5
child 184879 39c6f33dda9eefb6802beb2c111aeb2e1dd1ff53
push id26836
push usercbook@mozilla.com
push dateMon, 26 May 2014 12:37:49 +0000
treeherdermozilla-central@5cd52de816f9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1014626
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 1014626 - Fix Windows 64 build break
media/libstagefright/ports/win32/include/netinet/in.h
--- a/media/libstagefright/ports/win32/include/netinet/in.h
+++ b/media/libstagefright/ports/win32/include/netinet/in.h
@@ -1,39 +1,39 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-#ifndef IN_H_
-#define IN_H_
-
-#include <stdint.h>
-
-#if defined(_M_IX86)
-
-static uint32_t
-ntohl(uint32_t x)
-{
-  return x << 24 | (x << 8 & 0xff0000) | (x >> 8 & 0xff00) | x >> 24;
-}
-
-static uint16_t
-ntohs(uint16_t x)
-{
-  return x << 8 | x >> 8;
-}
-
-static uint32_t
-htonl(uint32_t x)
-{
-  return x << 24 | (x << 8 & 0xff0000) | (x >> 8 & 0xff00) | x >> 24;
-}
-
-static uint16_t
-htons(uint16_t x)
-{
-  return x << 8 | x >> 8;
-}
-
-#else
-#error Unsupported architecture
-#endif
-
-#endif
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+#ifndef IN_H_
+#define IN_H_
+
+#include <stdint.h>
+
+#if defined(_M_IX86) || defined(_M_AMD64)
+
+static uint32_t
+ntohl(uint32_t x)
+{
+  return x << 24 | (x << 8 & 0xff0000) | (x >> 8 & 0xff00) | x >> 24;
+}
+
+static uint16_t
+ntohs(uint16_t x)
+{
+  return x << 8 | x >> 8;
+}
+
+static uint32_t
+htonl(uint32_t x)
+{
+  return x << 24 | (x << 8 & 0xff0000) | (x >> 8 & 0xff00) | x >> 24;
+}
+
+static uint16_t
+htons(uint16_t x)
+{
+  return x << 8 | x >> 8;
+}
+
+#else
+#error Unsupported architecture
+#endif
+
+#endif