chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v229: Add missing fixes from upstream [6/6] src/systemd
[elogind.git]
/
src
/
systemd
/
_sd-common.h
diff --git
a/src/systemd/_sd-common.h
b/src/systemd/_sd-common.h
index cc3be9380315c4c1645a1a956de76ebee1b2033f..2d4e1f26e1ebfe92c55fb56af52573f7fd221127 100644
(file)
--- a/
src/systemd/_sd-common.h
+++ b/
src/systemd/_sd-common.h
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#ifndef foosdcommonhfoo
#define foosdcommonhfoo
#ifndef foosdcommonhfoo
#define foosdcommonhfoo
@@
-22,10
+20,10
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-/* This is a private header
,
never even think of including this directly! */
+/* This is a private header
;
never even think of including this directly! */
#if __INCLUDE_LEVEL__ <= 1
#if __INCLUDE_LEVEL__ <= 1
-#error "Do not include _sd-common.h directly
,
it is a private header."
+#error "Do not include _sd-common.h directly
;
it is a private header."
#endif
#ifndef _sd_printf_
#endif
#ifndef _sd_printf_
@@
-57,10
+55,10
@@
# ifdef __cplusplus
# define _SD_BEGIN_DECLARATIONS \
extern "C" { \
# ifdef __cplusplus
# define _SD_BEGIN_DECLARATIONS \
extern "C" { \
- struct _
_useless_struct_to_allow_trailing_semicolon_
_
+ struct _
sd_useless_struct_to_allow_trailing_semicolon
_
# else
# define _SD_BEGIN_DECLARATIONS \
# else
# define _SD_BEGIN_DECLARATIONS \
- struct _
_useless_struct_to_allow_trailing_semicolon_
_
+ struct _
sd_useless_struct_to_allow_trailing_semicolon
_
# endif
#endif
# endif
#endif
@@
-68,11
+66,18
@@
# ifdef __cplusplus
# define _SD_END_DECLARATIONS \
} \
# ifdef __cplusplus
# define _SD_END_DECLARATIONS \
} \
- struct _
_useless_struct_to_allow_trailing_semicolon_
_
+ struct _
sd_useless_cpp_struct_to_allow_trailing_semicolon
_
# else
# define _SD_END_DECLARATIONS \
# else
# define _SD_END_DECLARATIONS \
- struct _
_useless_struct_to_allow_trailing_semicolon_
_
+ struct _
sd_useless_struct_to_allow_trailing_semicolon
_
# endif
#endif
# endif
#endif
+#define _SD_DEFINE_POINTER_CLEANUP_FUNC(type, func) \
+ static inline void func##p(type **p) { \
+ if (*p) \
+ func(*p); \
+ } \
+ struct _sd_useless_struct_to_allow_trailing_semicolon_
+
#endif
#endif