chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f42ee48
)
systemd: update drop-in sd-daemon files
author
Kay Sievers
<kay.sievers@vrfy.org>
Thu, 6 Oct 2011 01:14:50 +0000
(
03:14
+0200)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Thu, 6 Oct 2011 01:14:50 +0000
(
03:14
+0200)
udev/sd-daemon.c
patch
|
blob
|
history
diff --git
a/udev/sd-daemon.c
b/udev/sd-daemon.c
index a2ec74cceb59a744f9bec7486972832896cdb2ff..e68b70875c749a22dcbbfc6d7338d2c848f3a317 100644
(file)
--- a/
udev/sd-daemon.c
+++ b/
udev/sd-daemon.c
@@
-49,13
+49,19
@@
#include "sd-daemon.h"
#include "sd-daemon.h"
-#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS)
-#define _sd_hidden_ __attribute__ ((visibility("hidden")))
+#if (__GNUC__ >= 4)
+#ifdef SD_EXPORT_SYMBOLS
+/* Export symbols */
+#define _sd_export_ __attribute__ ((visibility("default")))
#else
#else
-#define _sd_hidden_
+/* Don't export the symbols */
+#define _sd_export_ __attribute__ ((visibility("hidden")))
+#endif
+#else
+#define _sd_export_
#endif
#endif
-_sd_
hidden
_ int sd_listen_fds(int unset_environment) {
+_sd_
export
_ int sd_listen_fds(int unset_environment) {
#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
return 0;
#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
return 0;
@@
-136,7
+142,7
@@
finish:
#endif
}
#endif
}
-_sd_
hidden
_ int sd_is_fifo(int fd, const char *path) {
+_sd_
export
_ int sd_is_fifo(int fd, const char *path) {
struct stat st_fd;
if (fd < 0)
struct stat st_fd;
if (fd < 0)
@@
-169,7
+175,7
@@
_sd_hidden_ int sd_is_fifo(int fd, const char *path) {
return 1;
}
return 1;
}
-_sd_
hidden
_ int sd_is_special(int fd, const char *path) {
+_sd_
export
_ int sd_is_special(int fd, const char *path) {
struct stat st_fd;
if (fd < 0)
struct stat st_fd;
if (fd < 0)
@@
-256,7
+262,7
@@
union sockaddr_union {
struct sockaddr_storage storage;
};
struct sockaddr_storage storage;
};
-_sd_
hidden
_ int sd_is_socket(int fd, int family, int type, int listening) {
+_sd_
export
_ int sd_is_socket(int fd, int family, int type, int listening) {
int r;
if (family < 0)
int r;
if (family < 0)
@@
-284,7
+290,7
@@
_sd_hidden_ int sd_is_socket(int fd, int family, int type, int listening) {
return 1;
}
return 1;
}
-_sd_
hidden
_ int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) {
+_sd_
export
_ int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) {
union sockaddr_union sockaddr;
socklen_t l;
int r;
union sockaddr_union sockaddr;
socklen_t l;
int r;
@@
-329,7
+335,7
@@
_sd_hidden_ int sd_is_socket_inet(int fd, int family, int type, int listening, u
return 1;
}
return 1;
}
-_sd_
hidden
_ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) {
+_sd_
export
_ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) {
union sockaddr_union sockaddr;
socklen_t l;
int r;
union sockaddr_union sockaddr;
socklen_t l;
int r;
@@
-372,7
+378,7
@@
_sd_hidden_ int sd_is_socket_unix(int fd, int type, int listening, const char *p
return 1;
}
return 1;
}
-_sd_
hidden
_ int sd_is_mq(int fd, const char *path) {
+_sd_
export
_ int sd_is_mq(int fd, const char *path) {
#if !defined(__linux__)
return 0;
#else
#if !defined(__linux__)
return 0;
#else
@@
-409,7
+415,7
@@
_sd_hidden_ int sd_is_mq(int fd, const char *path) {
#endif
}
#endif
}
-_sd_
hidden
_ int sd_notify(int unset_environment, const char *state) {
+_sd_
export
_ int sd_notify(int unset_environment, const char *state) {
#if defined(DISABLE_SYSTEMD) || !defined(__linux__) || !defined(SOCK_CLOEXEC)
return 0;
#else
#if defined(DISABLE_SYSTEMD) || !defined(__linux__) || !defined(SOCK_CLOEXEC)
return 0;
#else
@@
-477,7
+483,7
@@
finish:
#endif
}
#endif
}
-_sd_
hidden
_ int sd_notifyf(int unset_environment, const char *format, ...) {
+_sd_
export
_ int sd_notifyf(int unset_environment, const char *format, ...) {
#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
return 0;
#else
#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
return 0;
#else
@@
-499,7
+505,7
@@
_sd_hidden_ int sd_notifyf(int unset_environment, const char *format, ...) {
#endif
}
#endif
}
-_sd_
hidden
_ int sd_booted(void) {
+_sd_
export
_ int sd_booted(void) {
#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
return 0;
#else
#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
return 0;
#else