From fbc1711b2b8038f1fed6791a6fbc6ce30d4faf00 Mon Sep 17 00:00:00 2001 From: Ho Cheung Date: Wed, 21 Jun 2023 22:18:58 +0800 Subject: [PATCH] [libjxl] Modify the header files that libjxl needs to generate --- .../libjxl/gen_headers/jxl/jxl_export.h | 45 ++++++++++++++++++- .../lib/include => gen_headers}/jxl/version.h | 0 2 files changed, 44 insertions(+), 1 deletion(-) rename src/third_party/libjxl/{src/lib/include => gen_headers}/jxl/version.h (100%) diff --git a/src/third_party/libjxl/gen_headers/jxl/jxl_export.h b/src/third_party/libjxl/gen_headers/jxl/jxl_export.h index 6fa2155..62ffc44 100644 --- a/src/third_party/libjxl/gen_headers/jxl/jxl_export.h +++ b/src/third_party/libjxl/gen_headers/jxl/jxl_export.h @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors +// Copyright 2023 The Chromium Authors, Alex313031, gz83, and mo271 // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,3 +9,46 @@ #define JXL_DEPRECATED #endif // THIRD_PARTY_LIBJXL_GEN_HEADERS_JXL_JXL_EXPORT_H_ + +#ifndef JXL_THREADS_EXPORT_H +#define JXL_THREADS_EXPORT_H + +#ifdef JXL_THREADS_STATIC_DEFINE +#define JXL_THREADS_EXPORT +#define JXL_THREADS_NO_EXPORT +#else +#ifndef JXL_THREADS_EXPORT +#ifdef JXL_THREADS_INTERNAL_LIBRARY_BUILD +/* We are building this library */ +#define JXL_THREADS_EXPORT __attribute__((visibility("default"))) +#else +/* We are using this library */ +#define JXL_THREADS_EXPORT __attribute__((visibility("default"))) +#endif +#endif + +#ifndef JXL_THREADS_NO_EXPORT +#define JXL_THREADS_NO_EXPORT __attribute__((visibility("hidden"))) +#endif +#endif + +#ifndef JXL_THREADS_DEPRECATED +#define JXL_THREADS_DEPRECATED __attribute__((__deprecated__)) +#endif + +#ifndef JXL_THREADS_DEPRECATED_EXPORT +#define JXL_THREADS_DEPRECATED_EXPORT JXL_THREADS_EXPORT JXL_THREADS_DEPRECATED +#endif + +#ifndef JXL_THREADS_DEPRECATED_NO_EXPORT +#define JXL_THREADS_DEPRECATED_NO_EXPORT \ + JXL_THREADS_NO_EXPORT JXL_THREADS_DEPRECATED +#endif + +#if 0 /* DEFINE_NO_DEPRECATED */ +#ifndef JXL_THREADS_NO_DEPRECATED +#define JXL_THREADS_NO_DEPRECATED +#endif +#endif + +#endif /* JXL_THREADS_EXPORT_H */ diff --git a/src/third_party/libjxl/src/lib/include/jxl/version.h b/src/third_party/libjxl/gen_headers/jxl/version.h similarity index 100% rename from src/third_party/libjxl/src/lib/include/jxl/version.h rename to src/third_party/libjxl/gen_headers/jxl/version.h