diff --git a/cef_paths2.gypi b/cef_paths2.gypi index f7414be05..22a75566b 100644 --- a/cef_paths2.gypi +++ b/cef_paths2.gypi @@ -8,7 +8,6 @@ 'include/base/cef_atomic_flag.h', 'include/base/cef_atomic_ref_count.h', 'include/base/cef_auto_reset.h', - 'include/base/cef_basictypes.h', 'include/base/cef_bind.h', 'include/base/cef_build.h', 'include/base/cef_callback.h', diff --git a/include/base/cef_basictypes.h b/include/base/cef_basictypes.h deleted file mode 100644 index ce4d6d8af..000000000 --- a/include/base/cef_basictypes.h +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012 -// Google Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the name Chromium Embedded -// Framework nor the names of its contributors may be used to endorse -// or promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#ifndef CEF_INCLUDE_BASE_CEF_BASICTYPES_H_ -#define CEF_INCLUDE_BASE_CEF_BASICTYPES_H_ -#pragma once - -#include // For UINT_MAX -#include // For size_t - -#include "include/base/cef_build.h" - -#endif // CEF_INCLUDE_BASE_CEF_BASICTYPES_H_ diff --git a/include/base/cef_platform_thread.h b/include/base/cef_platform_thread.h index e67eed41b..8e6dd0508 100644 --- a/include/base/cef_platform_thread.h +++ b/include/base/cef_platform_thread.h @@ -43,7 +43,6 @@ // If the Chromium implementation diverges the below implementation should be // updated to match. -#include "include/base/cef_basictypes.h" #include "include/base/cef_build.h" #include "include/internal/cef_thread_internal.h" diff --git a/include/internal/cef_string_types.h b/include/internal/cef_string_types.h index 5b65ecb2f..2ed605a62 100644 --- a/include/internal/cef_string_types.h +++ b/include/internal/cef_string_types.h @@ -32,8 +32,8 @@ #pragma once #include +#include -#include "include/base/cef_basictypes.h" #include "include/internal/cef_export.h" /// diff --git a/include/internal/cef_time.h b/include/internal/cef_time.h index 365d421ad..1a3d6c31a 100644 --- a/include/internal/cef_time.h +++ b/include/internal/cef_time.h @@ -38,7 +38,6 @@ extern "C" { #include #include -#include "include/base/cef_basictypes.h" #include "include/internal/cef_export.h" /// diff --git a/include/internal/cef_types.h b/include/internal/cef_types.h index 24f25d0d7..5d9de6ef7 100644 --- a/include/internal/cef_types.h +++ b/include/internal/cef_types.h @@ -31,7 +31,11 @@ #define CEF_INCLUDE_INTERNAL_CEF_TYPES_H_ #pragma once -#include "include/base/cef_basictypes.h" +#include +#include +#include +#include + #include "include/internal/cef_string.h" #include "include/internal/cef_string_list.h" #include "include/internal/cef_time.h"