diff --git a/security/certverifier/ExtendedValidation.cpp b/security/certverifier/ExtendedValidation.cpp index df2b31efb0e8..78f545497f80 100644 --- a/security/certverifier/ExtendedValidation.cpp +++ b/security/certverifier/ExtendedValidation.cpp @@ -10,7 +10,6 @@ #include "certdb.h" #include "base64.h" #include "hasht.h" -#include "pkix/stdkeywords.h" #include "pkix/pkixtypes.h" #include "pk11pub.h" #include "secerr.h" diff --git a/security/manager/boot/src/PublicKeyPinningService.cpp b/security/manager/boot/src/PublicKeyPinningService.cpp index 720157f925a4..69140a329629 100644 --- a/security/manager/boot/src/PublicKeyPinningService.cpp +++ b/security/manager/boot/src/PublicKeyPinningService.cpp @@ -13,7 +13,6 @@ #include "nsSiteSecurityService.h" #include "nsString.h" #include "nsTArray.h" -#include "pkix/stdkeywords.h" #include "pkix/pkixtypes.h" #include "prlog.h" #include "RootCertificateTelemetryUtils.h" diff --git a/security/pkix/include/pkix/Input.h b/security/pkix/include/pkix/Input.h index b924ab4ae93b..8ff9bb09243a 100644 --- a/security/pkix/include/pkix/Input.h +++ b/security/pkix/include/pkix/Input.h @@ -27,7 +27,6 @@ #include -#include "pkix/stdkeywords.h" #include "pkix/Result.h" #include "stdint.h" diff --git a/security/pkix/include/pkix/ScopedPtr.h b/security/pkix/include/pkix/ScopedPtr.h index 238de61e3da6..41369b9e51ee 100644 --- a/security/pkix/include/pkix/ScopedPtr.h +++ b/security/pkix/include/pkix/ScopedPtr.h @@ -25,8 +25,6 @@ #ifndef mozilla_pkix_ScopedPtr_h #define mozilla_pkix_ScopedPtr_h -#include "pkix/stdkeywords.h" - namespace mozilla { namespace pkix { // Similar to boost::scoped_ptr and std::unique_ptr. Does not support copying diff --git a/security/pkix/include/pkix/Time.h b/security/pkix/include/pkix/Time.h index 5365bd3e3700..9933438713ee 100644 --- a/security/pkix/include/pkix/Time.h +++ b/security/pkix/include/pkix/Time.h @@ -30,7 +30,6 @@ #include #include "pkix/Result.h" -#include "pkix/stdkeywords.h" namespace mozilla { namespace pkix { diff --git a/security/pkix/include/pkix/stdkeywords.h b/security/pkix/include/pkix/stdkeywords.h deleted file mode 100644 index 655fcf3695af..000000000000 --- a/security/pkix/include/pkix/stdkeywords.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- 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 code is made available to you under your choice of the following sets - * of licensing terms: - */ -/* 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/. - */ -/* Copyright 2013 Mozilla Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef mozilla_pkix_stdkeywords_h -#define mozilla_pkix_stdkeywords_h - -#if defined(__GNUC__) && !defined(__clang__) - -// GCC does not understand final/override until 4.7 -#if __GNUC__ * 100 + __GNUC_MINOR__ < 407 -#define final -#define override -#endif - -#endif // defined(__GNUC__) && !defined(__clang__) - -#endif // mozilla_pkix_stdkeywords_h