diff options
| author | Andre Heinecke <aheinecke@intevation.de> | 2011-03-07 11:43:23 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-03-07 13:50:38 +0000 |
| commit | e0fc90bdf2c60a4c77fffaf490d6f06b2bd6999d (patch) | |
| tree | 3fe6f065398d1fcb55243e81ae96acbfc69d1669 /bus/config-parser-common.h | |
| parent | f1ba52066cadb90edb192ea93d55ba775bdb73d7 (diff) | |
| download | dbus-e0fc90bdf2c60a4c77fffaf490d6f06b2bd6999d.tar.gz | |
Do not use the name ELEMENT_TYPE
On Windows Systems ELEMENT_TYPE is already defined
in Winioctl.h this header is included indirectly
in dbus-sysdeps.h. By avoiding the use of the Name
ELEMENT_TYPE it is ensured that config-parser-common.h
can be included together with dbus-sysdeps.h
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'bus/config-parser-common.h')
| -rw-r--r-- | bus/config-parser-common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bus/config-parser-common.h b/bus/config-parser-common.h index da745606..186bf4cf 100644 --- a/bus/config-parser-common.h +++ b/bus/config-parser-common.h @@ -41,7 +41,8 @@ typedef enum ELEMENT_SERVICEDIR, ELEMENT_SERVICEHELPER, ELEMENT_INCLUDEDIR, - ELEMENT_TYPE, + /* this is really <type>, but winioctl.h defines ELEMENT_TYPE */ + ELEMENT_CONFIGTYPE, ELEMENT_SELINUX, ELEMENT_ASSOCIATE, ELEMENT_STANDARD_SESSION_SERVICEDIRS, |