Bug 1114724 - Define PRIuSIZE format specifiers for size_t. r=Waldo

ipc/glue/MessageChannel.cpp

@@ -13,6 +13,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Move.h"
+#include "mozilla/SizePrintfMacros.h"
 #include "nsDebug.h"
 #include "nsISupportsImpl.h"
 #include "nsContentUtils.h"
@@ -115,7 +116,6 @@ enum Direction
     OUT_MESSAGE
 };
 
-
 class MessageChannel::InterruptFrame
 {
 private:

mfbt/IntegerPrintfMacros.h

@@ -59,9 +59,4 @@
 #  define PRIXPTR "X"  /* uintptr_t */
 #endif
 
-/**
- * For printing size_t.
- */
-#define PRIuSIZE PRIuPTR
-
 #endif  /* mozilla_IntegerPrintfMacros_h_ */

mfbt/SizePrintfMacros.h

@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* 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/. */
+
+/* Implements (nonstandard) PRI{ouxX}SIZE format macros for size_t types. */
+
+#ifndef mozilla_SizePrintfMacros_h_
+#define mozilla_SizePrintfMacros_h_
+
+/*
+ * MSVC's libc does not support C99's %z format length modifier for size_t
+ * types. Instead, we use Microsoft's nonstandard %I modifier for size_t, which
+ * is unsigned __int32 on 32-bit platforms and unsigned __int64 on 64-bit
+ * platforms:
+ *
+ * http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx
+ */
+
+#if defined(XP_WIN)
+#  define PRIoSIZE  "Io"
+#  define PRIuSIZE  "Iu"
+#  define PRIxSIZE  "Ix"
+#  define PRIXSIZE  "IX"
+#else
+#  define PRIoSIZE  "zo"
+#  define PRIuSIZE  "zu"
+#  define PRIxSIZE  "zx"
+#  define PRIXSIZE  "zX"
+#endif
+
+#endif  /* mozilla_SizePrintfMacros_h_ */

mfbt/moz.build

@@ -63,6 +63,7 @@ EXPORTS.mozilla = [
     'Scoped.h',
     'SegmentedVector.h',
     'SHA1.h',
+    'SizePrintfMacros.h',
     'SplayTree.h',
     'TaggedAnonymousMemory.h',
     'TemplateLib.h',