c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Move definition of ATTRIBUTE_DESTRUCTOR to libxml.h

Browse Source
This commit is contained in:
Nick Wellnhofer 2024-06-25 22:06:36 +02:00
parent fd099dd8dc
commit 1afaa37128
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -139,9 +139,6 @@ if (NOT MSVC)
f(void) {} f(void) {}
int main(void) { return 0; } int main(void) { return 0; }
" HAVE_ATTRIBUTE_DESTRUCTOR) " HAVE_ATTRIBUTE_DESTRUCTOR)
if(HAVE_ATTRIBUTE_DESTRUCTOR)
set(ATTRIBUTE_DESTRUCTOR "__attribute__((destructor))")
endif()
check_include_files(arpa/inet.h HAVE_ARPA_INET_H) check_include_files(arpa/inet.h HAVE_ARPA_INET_H)
check_function_exists(class HAVE_CLASS) check_function_exists(class HAVE_CLASS)
check_include_files(dlfcn.h HAVE_DLFCN_H) check_include_files(dlfcn.h HAVE_DLFCN_H)

3
config.h.cmake.in
View File

@ -1,6 +1,3 @@
/* A form that will not confuse apibuild.py */
#cmakedefine ATTRIBUTE_DESTRUCTOR @ATTRIBUTE_DESTRUCTOR@
/* Define to 1 if you have the <arpa/inet.h> header file. */ /* Define to 1 if you have the <arpa/inet.h> header file. */
#cmakedefine HAVE_ARPA_INET_H 1 #cmakedefine HAVE_ARPA_INET_H 1

1
configure.ac
View File

@ -355,7 +355,6 @@ void __attribute__((destructor))
f(void) {}], [], [ f(void) {}], [], [
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_ATTRIBUTE_DESTRUCTOR], [1],[Define if __attribute__((destructor)) is accepted]) AC_DEFINE([HAVE_ATTRIBUTE_DESTRUCTOR], [1],[Define if __attribute__((destructor)) is accepted])
AC_DEFINE([ATTRIBUTE_DESTRUCTOR], [__attribute__((destructor))],[A form that will not confuse apibuild.py])],[
AC_MSG_RESULT(no)]) AC_MSG_RESULT(no)])
dnl dnl

4
libxml.h
View File

@ -53,6 +53,10 @@
#define ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED
#endif #endif
#ifdef HAVE_ATTRIBUTE_DESTRUCTOR
#define ATTRIBUTE_DESTRUCTOR __attribute__((destructor))
#endif
#if defined(__clang__) || \ #if defined(__clang__) || \
(defined(__GNUC__) && (__GNUC__ >= 8) && !defined(__EDG__)) (defined(__GNUC__) && (__GNUC__ >= 8) && !defined(__EDG__))
#define ATTRIBUTE_NO_SANITIZE(arg) __attribute__((no_sanitize(arg))) #define ATTRIBUTE_NO_SANITIZE(arg) __attribute__((no_sanitize(arg)))

1
meson.build
View File

@ -298,7 +298,6 @@ endif
### __attribute__((destructor)) ### __attribute__((destructor))
if cc.has_function_attribute('destructor') if cc.has_function_attribute('destructor')
config_h.set10('HAVE_ATTRIBUTE_DESTRUCTOR', true) config_h.set10('HAVE_ATTRIBUTE_DESTRUCTOR', true)
config_h.set('ATTRIBUTE_DESTRUCTOR', '__attribute__((destructor))')
endif endif
### DSO support ### DSO support