X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bus%2Fconfig-parser-common.h;h=186bf4cf7428ad97aa1b9158523a160587cb48cb;hb=6d86c59182fa7b204e4f952301bc0fd75c3ec3e1;hp=2c296433c789dc7389c9531632abdff65bbd96e6;hpb=f322112b84bef5f6e7c38c08e99a28c4f576c897;p=platform%2Fupstream%2Fdbus.git

diff --git a/bus/config-parser-common.h b/bus/config-parser-common.h
index 2c29643..186bf4c 100644
--- a/bus/config-parser-common.h
+++ b/bus/config-parser-common.h
@@ -17,15 +17,13 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 
 #ifndef BUS_CONFIG_PARSER_COMMON_H
 #define BUS_CONFIG_PARSER_COMMON_H
 
-#include <config.h>
-
 typedef enum
 {
   ELEMENT_NONE,
@@ -43,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,