Bug 1298855 - part 2 - remove prcpucfg.h #include from xpt_arena.h; r=erahm
authorNathan Froyd <froydnj@mozilla.com>
Wed, 21 Sep 2016 18:16:10 -0400
changeset 314830 6b12cec59752d5e42c5013c3551287608a388d03
parent 314829 fd9ce614a6112b0650c8e6eb82c0eba455dfced0
child 314831 037d241ec65c0b95cc14105d24ccc7b994c3d390
push id20591
push usercbook@mozilla.com
push dateThu, 22 Sep 2016 11:42:18 +0000
treeherderfx-team@f0e6cc636021 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerserahm
bugs1298855
milestone52.0a1
Bug 1298855 - part 2 - remove prcpucfg.h #include from xpt_arena.h; r=erahm Nothing else in this code requires prcpucfg.h at this point, and we might as well remove nspr.h from xpt_xdr.cpp while we're at it.
xpcom/typelib/xpt/xpt_arena.h
xpcom/typelib/xpt/xpt_xdr.cpp
--- a/xpcom/typelib/xpt/xpt_arena.h
+++ b/xpcom/typelib/xpt/xpt_arena.h
@@ -5,17 +5,16 @@
 
 /*
  * Simple arena allocator for xpt (which avoids using NSPR).
  */
 
 #ifndef __xpt_arena_h__
 #define __xpt_arena_h__
 
-#include "prcpucfg.h"
 #include <stdlib.h>
 #include "mozilla/Attributes.h"
 #include "mozilla/MemoryReporting.h"
 #include <stdint.h>
 
 
 /*
  * The XPT library is statically linked: no functions are exported from
--- a/xpcom/typelib/xpt/xpt_xdr.cpp
+++ b/xpcom/typelib/xpt/xpt_xdr.cpp
@@ -1,17 +1,16 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
 
 /* Implementation of XDR primitives. */
 
 #include "xpt_xdr.h"
-#include "nspr.h"
 #include "nscore.h"
 #include <string.h>             /* strchr */
 #include "mozilla/EndianUtils.h"
 
 #define CURS_POOL_OFFSET_RAW(cursor)                                          \
   ((cursor)->pool == XPT_HEADER                                               \
    ? (cursor)->offset                                                         \
    : (XPT_ASSERT((cursor)->state->data_offset),                               \