summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2014-03-19 11:20:41 +0900
committerLennart Poettering <lennart@poettering.net>2014-03-24 20:36:57 +0100
commite43e3e3eed40d72d2d2d3efff2d889a91ef93262 (patch)
tree4b30f6750102f2fa322788c52ea14a7b73266abe
parent7f8aa67131cfc03ddcbd31c0420754864fc122f0 (diff)
libsystemd: Don't use "class" in public headers
For compatibility with C++
-rw-r--r--src/systemd/sd-login.h2
-rw-r--r--src/systemd/sd-resolve.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
index 87ebafb264..c539dd8005 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 3c1d482374..a02be7df4e 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