backout an accidental change that landed with bug 817133
authorTrevor Saunders <trev.saunders@gmail.com>
Wed, 05 Dec 2012 20:35:09 -0500
changeset 115151 c7d448fde422b0034e7625ce59926bb25afc7145
parent 115150 d1fba48c7253db66bdca75e049a239f49d168303
child 115152 7ad2846f3ece3174e9ceb7678a8d4055d58012b7
push id23973
push useremorley@mozilla.com
push dateThu, 06 Dec 2012 10:04:18 +0000
treeherdermozilla-central@ddda5400c826 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs817133
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
backout an accidental change that landed with bug 817133
modules/libmar/src/mar_private.h
--- a/modules/libmar/src/mar_private.h
+++ b/modules/libmar/src/mar_private.h
@@ -48,31 +48,30 @@ PR_STATIC_ASSERT(sizeof(BLOCKSIZE) < \
 #define PRODUCT_INFO_BLOCK_ID 1
 
 #define MAR_ITEM_SIZE(namelen) (3*sizeof(uint32_t) + (namelen) + 1)
 
 /* Product Information Block (PIB) constants */
 #define PIB_MAX_MAR_CHANNEL_ID_SIZE 63
 #define PIB_MAX_PRODUCT_VERSION_SIZE 31
 
-#include <stdio.h>
-
 /* The mar program is compiled as a host bin so we don't have access to NSPR at
    runtime.  For that reason we use ntohl, htonl, and define HOST_TO_NETWORK64 
    instead of the NSPR equivalents. */
 #ifdef XP_WIN
 #include <winsock2.h>
 #define ftello _ftelli64
 #define fseeko _fseeki64
 #else
 #define _FILE_OFFSET_BITS 64
 #include <netinet/in.h>
 #include <unistd.h>
 #endif
 
+#include <stdio.h>
 
 #define HOST_TO_NETWORK64(x) ( \
   ((((uint64_t) x) & 0xFF) << 56) | \
   ((((uint64_t) x) >> 8) & 0xFF) << 48) | \
   (((((uint64_t) x) >> 16) & 0xFF) << 40) | \
   (((((uint64_t) x) >> 24) & 0xFF) << 32) | \
   (((((uint64_t) x) >> 32) & 0xFF) << 24) | \
   (((((uint64_t) x) >> 40) & 0xFF) << 16) | \