projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ListNames and ListQueuedOwners updated to work with new kdbus
[platform/upstream/dbus.git]
/
bus
/
config-parser-common.h
diff --git
a/bus/config-parser-common.h
b/bus/config-parser-common.h
index
dc0e0ed
..
186bf4c
100644
(file)
--- a/
bus/config-parser-common.h
+++ b/
bus/config-parser-common.h
@@
-24,8
+24,6
@@
#ifndef BUS_CONFIG_PARSER_COMMON_H
#define BUS_CONFIG_PARSER_COMMON_H
#ifndef BUS_CONFIG_PARSER_COMMON_H
#define BUS_CONFIG_PARSER_COMMON_H
-#include <config.h>
-
typedef enum
{
ELEMENT_NONE,
typedef enum
{
ELEMENT_NONE,
@@
-43,7
+41,8
@@
typedef enum
ELEMENT_SERVICEDIR,
ELEMENT_SERVICEHELPER,
ELEMENT_INCLUDEDIR,
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,
ELEMENT_SELINUX,
ELEMENT_ASSOCIATE,
ELEMENT_STANDARD_SESSION_SERVICEDIRS,