From a52ab741019342fbca0468e43a01deb44fa5f1bd Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 29 Sep 2016 13:59:29 -0700 Subject: Move core/fxcrt/include to core/fxcrt BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2382723003 --- third_party/DEPS | 8 ++++---- third_party/agg23/agg_array.h | 2 +- third_party/agg23/agg_basics.h | 2 +- third_party/agg23/agg_curves.cpp | 2 +- third_party/agg23/agg_path_storage.cpp | 2 +- third_party/agg23/agg_rasterizer_scanline_aa.h | 4 ++-- third_party/agg23/agg_vcgen_dash.cpp | 2 +- third_party/agg23/agg_vcgen_stroke.cpp | 2 +- third_party/lcms2-2.6/src/cmserr.c | 4 ++-- third_party/libjpeg/jinclude.h | 2 +- third_party/libtiff/tiffconf.h | 2 +- third_party/zlib_v128/zutil.h | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) (limited to 'third_party') diff --git a/third_party/DEPS b/third_party/DEPS index 7cc56b3b10..c2a3adde7b 100644 --- a/third_party/DEPS +++ b/third_party/DEPS @@ -1,7 +1,7 @@ include_rules = [ # A lot of third_party code has been modified to use fxcrt. - '+core/fxcrt/include/fx_basic.h', - '+core/fxcrt/include/fx_coordinates.h', - '+core/fxcrt/include/fx_memory.h', - '+core/fxcrt/include/fx_system.h', + '+core/fxcrt/fx_basic.h', + '+core/fxcrt/fx_coordinates.h', + '+core/fxcrt/fx_memory.h', + '+core/fxcrt/fx_system.h', ] diff --git a/third_party/agg23/agg_array.h b/third_party/agg23/agg_array.h index 3a7fb7c9bd..204ae2e7a2 100644 --- a/third_party/agg23/agg_array.h +++ b/third_party/agg23/agg_array.h @@ -17,7 +17,7 @@ #define AGG_ARRAY_INCLUDED #include "agg_basics.h" -#include "core/fxcrt/include/fx_memory.h" // For FXSYS_* macros. +#include "core/fxcrt/fx_memory.h" // For FXSYS_* macros. namespace agg { diff --git a/third_party/agg23/agg_basics.h b/third_party/agg23/agg_basics.h index f3dc43cc08..52a658ec96 100644 --- a/third_party/agg23/agg_basics.h +++ b/third_party/agg23/agg_basics.h @@ -41,7 +41,7 @@ #endif #define AGG_INLINE inline -#include "core/fxcrt/include/fx_system.h" // For FX_FLOAT +#include "core/fxcrt/fx_system.h" // For FX_FLOAT namespace agg { diff --git a/third_party/agg23/agg_curves.cpp b/third_party/agg23/agg_curves.cpp index 619fb6f8d4..b86cf630c3 100644 --- a/third_party/agg23/agg_curves.cpp +++ b/third_party/agg23/agg_curves.cpp @@ -21,7 +21,7 @@ #include "agg_curves.h" #include "agg_math.h" -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" namespace agg { diff --git a/third_party/agg23/agg_path_storage.cpp b/third_party/agg23/agg_path_storage.cpp index 4c44ca7136..968746738a 100644 --- a/third_party/agg23/agg_path_storage.cpp +++ b/third_party/agg23/agg_path_storage.cpp @@ -25,7 +25,7 @@ #include "agg_math.h" #include "agg_path_storage.h" -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" namespace agg { diff --git a/third_party/agg23/agg_rasterizer_scanline_aa.h b/third_party/agg23/agg_rasterizer_scanline_aa.h index 47e8e71f63..77e04edee9 100644 --- a/third_party/agg23/agg_rasterizer_scanline_aa.h +++ b/third_party/agg23/agg_rasterizer_scanline_aa.h @@ -35,8 +35,8 @@ #include "agg_clip_liang_barsky.h" #include "agg_math.h" #include "agg_render_scanlines.h" -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_memory.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_memory.h" namespace agg { diff --git a/third_party/agg23/agg_vcgen_dash.cpp b/third_party/agg23/agg_vcgen_dash.cpp index 3d05d888a4..bd5a2122a2 100644 --- a/third_party/agg23/agg_vcgen_dash.cpp +++ b/third_party/agg23/agg_vcgen_dash.cpp @@ -20,7 +20,7 @@ #include "agg_shorten_path.h" #include "agg_vcgen_dash.h" -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" namespace agg { diff --git a/third_party/agg23/agg_vcgen_stroke.cpp b/third_party/agg23/agg_vcgen_stroke.cpp index 7b78ad9007..03225b1649 100644 --- a/third_party/agg23/agg_vcgen_stroke.cpp +++ b/third_party/agg23/agg_vcgen_stroke.cpp @@ -24,7 +24,7 @@ //---------------------------------------------------------------------------- #include "agg_vcgen_stroke.h" -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" namespace agg { diff --git a/third_party/lcms2-2.6/src/cmserr.c b/third_party/lcms2-2.6/src/cmserr.c index 6954474470..77b67b43aa 100644 --- a/third_party/lcms2-2.6/src/cmserr.c +++ b/third_party/lcms2-2.6/src/cmserr.c @@ -251,8 +251,8 @@ cmsBool _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase *Data) return TRUE; } #else -#include "core/fxcrt/include/fx_memory.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_memory.h" +#include "core/fxcrt/fx_system.h" cmsBool _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase* Plugin) { diff --git a/third_party/libjpeg/jinclude.h b/third_party/libjpeg/jinclude.h index 94a09c2018..6f6a87c79e 100644 --- a/third_party/libjpeg/jinclude.h +++ b/third_party/libjpeg/jinclude.h @@ -20,7 +20,7 @@ #include "jconfig.h" /* auto configuration options */ #define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" /* * We need the NULL macro and size_t typedef. diff --git a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h index b80d197fa0..26de163aba 100644 --- a/third_party/libtiff/tiffconf.h +++ b/third_party/libtiff/tiffconf.h @@ -7,7 +7,7 @@ #ifndef _TIFFCONF_ #define _TIFFCONF_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" //NOTE: The tiff codec requires an ANSI C compiler environment for building and // presumes an ANSI C environment for use. diff --git a/third_party/zlib_v128/zutil.h b/third_party/zlib_v128/zutil.h index c9d8c16845..c3b10e109b 100644 --- a/third_party/zlib_v128/zutil.h +++ b/third_party/zlib_v128/zutil.h @@ -13,7 +13,7 @@ #ifndef ZUTIL_H #define ZUTIL_H -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #ifdef HAVE_HIDDEN # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) -- cgit v1.2.3