From e43e3e3eed40d72d2d2d3efff2d889a91ef93262 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Wed, 19 Mar 2014 11:20:41 +0900 Subject: [PATCH] libsystemd: Don't use "class" in public headers For compatibility with C++ --- src/systemd/sd-login.h | 2 +- src/systemd/sd-resolve.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h index 87ebafb26..c539dd800 100644 --- a/src/systemd/sd-login.h +++ b/src/systemd/sd-login.h @@ -178,7 +178,7 @@ int sd_seat_can_tty(const char *seat); int sd_seat_can_graphical(const char *seat); /* Return the class of machine */ -int sd_machine_get_class(const char *machine, char **class); +int sd_machine_get_class(const char *machine, char **clazz); /* Get all seats, store in *seats. Returns the number of seats. If * seats is NULL only returns number of seats. */ diff --git a/src/systemd/sd-resolve.h b/src/systemd/sd-resolve.h index 3c1d48237..a02be7df4 100644 --- a/src/systemd/sd-resolve.h +++ b/src/systemd/sd-resolve.h @@ -103,13 +103,13 @@ int sd_resolve_getnameinfo_done(sd_resolve_query* q, char **ret_host, char **ret * compatible with the ones of libc's res_query(3). The function returns a new * query object. When the query is completed you may retrieve the results using * sd_resolve_res_done(). */ -int sd_resolve_res_query(sd_resolve *resolve, sd_resolve_query **q, const char *dname, int class, int type); +int sd_resolve_res_query(sd_resolve *resolve, sd_resolve_query **q, const char *dname, int clazz, int type); /** Issue an resolver query on the specified session. The arguments are * compatible with the ones of libc's res_search(3). The function returns a new * query object. When the query is completed you may retrieve the results using * sd_resolve_res_done(). */ -int sd_resolve_res_search(sd_resolve *resolve, sd_resolve_query **q, const char *dname, int class, int type); +int sd_resolve_res_search(sd_resolve *resolve, sd_resolve_query **q, const char *dname, int clazz, int type); /** Retrieve the results of a preceding sd_resolve_res_query() or * resolve_res_search call. The query object q is destroyed by this -- 2.30.2