Bug 1173681 - Don't export the ProfileUnlockerWin.h header. r=bsmedberg
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 12 Jun 2015 08:19:33 +0900
changeset 280813 2d5feec035e2c5f5ac43410faed8acaedcbdba9e
parent 280812 391f2ca623eb9c8e48faf3781f170b27695e8f11
child 280814 42077df6e5734b34aeaf2370bb6ffe8364925a6d
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs1173681
milestone41.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 1173681 - Don't export the ProfileUnlockerWin.h header. r=bsmedberg
profile/dirserviceprovider/ProfileUnlockerWin.cpp
profile/dirserviceprovider/ProfileUnlockerWin.h
profile/dirserviceprovider/moz.build
profile/dirserviceprovider/nsProfileLock.cpp
--- a/profile/dirserviceprovider/ProfileUnlockerWin.cpp
+++ b/profile/dirserviceprovider/ProfileUnlockerWin.cpp
@@ -1,15 +1,15 @@
 /* -*- 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/. */
 
-#include "mozilla/ProfileUnlockerWin.h"
+#include "ProfileUnlockerWin.h"
 #include "nsCOMPtr.h"
 #include "nsIFile.h"
 #include "nsTArray.h"
 #include "nsXPCOM.h"
 
 namespace mozilla {
 
 /**
--- a/profile/dirserviceprovider/ProfileUnlockerWin.h
+++ b/profile/dirserviceprovider/ProfileUnlockerWin.h
@@ -1,16 +1,16 @@
 /* -*- 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/. */
 
-#ifndef mozilla_ProfileUnlockerWin_h
-#define mozilla_ProfileUnlockerWin_h
+#ifndef ProfileUnlockerWin_h
+#define ProfileUnlockerWin_h
 
 #include <windows.h>
 #include <restartmanager.h>
 
 #include "nsIProfileUnlocker.h"
 #include "nsProfileStringTypes.h"
 #include "nsWindowsHelpers.h"
 
@@ -51,10 +51,10 @@ private:
   RMENDSESSION              mRmEndSession;
   QUERYFULLPROCESSIMAGENAME mQueryFullProcessImageName;
 
   nsString                  mFileName;
 };
 
 } // namespace mozilla
 
-#endif // mozilla_ProfileUnlockerWin_h
+#endif // ProfileUnlockerWin_h
 
--- a/profile/dirserviceprovider/moz.build
+++ b/profile/dirserviceprovider/moz.build
@@ -8,17 +8,16 @@ EXPORTS += [
     'nsProfileDirServiceProvider.h',
 ]
 
 UNIFIED_SOURCES += ['nsProfileDirServiceProvider.cpp']
 if CONFIG['MOZ_PROFILELOCKING']:
     UNIFIED_SOURCES += ['nsProfileLock.cpp']
     if CONFIG['OS_ARCH'] == 'WINNT':
         UNIFIED_SOURCES += ['ProfileUnlockerWin.cpp']
-        EXPORTS.mozilla += ['ProfileUnlockerWin.h']
 
 Library('profdirserviceprovidersa_s')
 
 FORCE_STATIC_LIB = True
 
 DEFINES['XPCOM_GLUE'] = 1
 
 DISABLE_STL_WRAPPING = True
--- a/profile/dirserviceprovider/nsProfileLock.cpp
+++ b/profile/dirserviceprovider/nsProfileLock.cpp
@@ -4,17 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsProfileStringTypes.h"
 #include "nsProfileLock.h"
 #include "nsCOMPtr.h"
 #include "nsQueryObject.h"
 
 #if defined(XP_WIN)
-#include "mozilla/ProfileUnlockerWin.h"
+#include "ProfileUnlockerWin.h"
 #include "nsAutoPtr.h"
 #endif
 
 #if defined(XP_MACOSX)
 #include <Carbon/Carbon.h>
 #include <CoreFoundation/CoreFoundation.h>
 #endif