fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-02 03:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus: Move DBUS_PRIVATE_EXPORT to private header

Browse source 
Unlike the rest of the macros in dbus-macros.h, this one would never
have made sense to use in a public header.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-04-21 14:38:55 +01:00 • committed by Ralf Habacker
parent f8e3736385
commit 76fe49b7ab
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dbus/dbus-macros-internal.h
View file

@ -1,5 +1,6 @@
/*
* Copyright © 2019 Collabora Ltd.
* Copyright © 2010-2015 Ralf Habacker
* Copyright © 2015-2019 Collabora Ltd.
* SPDX-License-Identifier: AFL-2.1 or GPL-2.0-or-later
*
* Licensed under the Academic Free License version 2.1
@ -33,4 +34,20 @@
# define DBUS_EMBEDDED_TESTS_EXPORT /* nothing */
#endif
#if defined(DBUS_PRIVATE_EXPORT)
/* value forced by compiler command line, don't redefine */
#elif defined(_WIN32)
# if defined(DBUS_STATIC_BUILD)
# define DBUS_PRIVATE_EXPORT /* no decoration */
# elif defined(dbus_1_EXPORTS)
# define DBUS_PRIVATE_EXPORT __declspec(dllexport)
# else
# define DBUS_PRIVATE_EXPORT __declspec(dllimport)
# endif
#elif defined(__GNUC__) && __GNUC__ >= 4
# define DBUS_PRIVATE_EXPORT __attribute__ ((__visibility__ ("default")))
#else
# define DBUS_PRIVATE_EXPORT /* no decoration */
#endif
#endif

16
dbus/dbus-macros.h
View file

@ -210,22 +210,6 @@
#define DBUS_EXPORT
#endif
#if defined(DBUS_PRIVATE_EXPORT)
/* value forced by compiler command line, don't redefine */
#elif defined(_WIN32)
# if defined(DBUS_STATIC_BUILD)
# define DBUS_PRIVATE_EXPORT /* no decoration */
# elif defined(dbus_1_EXPORTS)
# define DBUS_PRIVATE_EXPORT __declspec(dllexport)
# else
# define DBUS_PRIVATE_EXPORT __declspec(dllimport)
# endif
#elif defined(__GNUC__) && __GNUC__ >= 4
# define DBUS_PRIVATE_EXPORT __attribute__ ((__visibility__ ("default")))
#else
# define DBUS_PRIVATE_EXPORT /* no decoration */
#endif
/* Implementation for dbus_clear_message() etc. This is not API,
* do not use it directly.
*

1
dbus/dbus-uuidgen.h
View file

@ -27,6 +27,7 @@
#ifndef DBUS_UUIDGEN_H
#define DBUS_UUIDGEN_H
#include <dbus/dbus-macros-internal.h>
#include <dbus/dbus-types.h>
#include <dbus/dbus-errors.h>