# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1207237764 0
# Node ID 4963e22a267a3798516445e3fec6b4a761802bd6
# Parent  a7222d7fb7a8e971e23c1edfdc64fdbd402e3761
Equalized defines against duplicated header inclusion.

diff -r a7222d7fb7a8 -r 4963e22a267a devices/ecdev.h
--- a/devices/ecdev.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/devices/ecdev.h	Thu Apr 03 15:49:24 2008 +0000
@@ -46,8 +46,8 @@
 
 /*****************************************************************************/
 
-#ifndef _ETHERCAT_DEVICE_H_
-#define _ETHERCAT_DEVICE_H_
+#ifndef __ECDEV_H__
+#define __ECDEV_H__
 
 #include <linux/netdevice.h>
 
diff -r a7222d7fb7a8 -r 4963e22a267a globals.h
--- a/globals.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/globals.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_GLOBALS_
-#define _EC_GLOBALS_
+#ifndef __EC_GLOBALS_H__
+#define __EC_GLOBALS_H__
 
 #include "config.h"
 
diff -r a7222d7fb7a8 -r 4963e22a267a master/datagram.h
--- a/master/datagram.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/datagram.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_DATAGRAM_H_
-#define _EC_DATAGRAM_H_
+#ifndef __EC_DATAGRAM_H__
+#define __EC_DATAGRAM_H__
 
 #include <linux/list.h>
 #include <linux/time.h>
diff -r a7222d7fb7a8 -r 4963e22a267a master/device.h
--- a/master/device.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/device.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_DEVICE_H_
-#define _EC_DEVICE_H_
+#ifndef __EC_DEVICE_H__
+#define __EC_DEVICE_H__
 
 #include <linux/interrupt.h>
 
diff -r a7222d7fb7a8 -r 4963e22a267a master/domain.h
--- a/master/domain.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/domain.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_DOMAIN_H_
-#define _EC_DOMAIN_H_
+#ifndef __EC_DOMAIN_H__
+#define __EC_DOMAIN_H__
 
 #include <linux/list.h>
 #include <linux/kobject.h>
diff -r a7222d7fb7a8 -r 4963e22a267a master/fmmu_config.h
--- a/master/fmmu_config.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/fmmu_config.h	Thu Apr 03 15:49:24 2008 +0000
@@ -37,8 +37,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_FMMU_CONFIG_H_
-#define _EC_FMMU_CONFIG_H_
+#ifndef __EC_FMMU_CONFIG_H__
+#define __EC_FMMU_CONFIG_H__
 
 #include "../include/ecrt.h"
 
diff -r a7222d7fb7a8 -r 4963e22a267a master/fsm_change.h
--- a/master/fsm_change.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/fsm_change.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef __EC_FSM_CHANGE__
-#define __EC_FSM_CHANGE__
+#ifndef __EC_FSM_CHANGE_H__
+#define __EC_FSM_CHANGE_H__
 
 #include "globals.h"
 #include "../include/ecrt.h"
diff -r a7222d7fb7a8 -r 4963e22a267a master/fsm_coe.h
--- a/master/fsm_coe.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/fsm_coe.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef __EC_FSM_COE__
-#define __EC_FSM_COE__
+#ifndef __EC_FSM_COE_H__
+#define __EC_FSM_COE_H__
 
 #include "globals.h"
 #include "../include/ecrt.h"
diff -r a7222d7fb7a8 -r 4963e22a267a master/fsm_coe_map.h
--- a/master/fsm_coe_map.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/fsm_coe_map.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef __EC_FSM_COE_MAP__
-#define __EC_FSM_COE_MAP__
+#ifndef __EC_FSM_COE_MAP_H__
+#define __EC_FSM_COE_MAP_H__
 
 #include "globals.h"
 #include "datagram.h"
diff -r a7222d7fb7a8 -r 4963e22a267a master/fsm_master.h
--- a/master/fsm_master.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/fsm_master.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef __EC_FSM_MASTER__
-#define __EC_FSM_MASTER__
+#ifndef __EC_FSM_MASTER_H__
+#define __EC_FSM_MASTER_H__
 
 #include "../include/ecrt.h"
 
diff -r a7222d7fb7a8 -r 4963e22a267a master/fsm_pdo_assign.h
--- a/master/fsm_pdo_assign.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/fsm_pdo_assign.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_FSM_PDO_ASSIGN_H_
-#define _EC_FSM_PDO_ASSIGN_H_
+#ifndef __EC_FSM_PDO_ASSIGN_H__
+#define __EC_FSM_PDO_ASSIGN_H__
 
 #include "../include/ecrt.h"
 
diff -r a7222d7fb7a8 -r 4963e22a267a master/fsm_pdo_mapping.h
--- a/master/fsm_pdo_mapping.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/fsm_pdo_mapping.h	Thu Apr 03 15:49:24 2008 +0000
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- *  $Id$
+ *  $Id: fsm_pdo_config.h 1069 2008-03-03 16:22:39Z fp $
  *
  *  Copyright (C) 2006  Florian Pose, Ingenieurgemeinschaft IgH
  *
@@ -37,8 +37,8 @@
 
 /*****************************************************************************/
 
-#ifndef __EC_FSM_PDO_MAPPING__
-#define __EC_FSM_PDO_MAPPING__
+#ifndef __EC_FSM_PDO_MAPPING_H__
+#define __EC_FSM_PDO_MAPPING_H__
 
 #include "globals.h"
 #include "../include/ecrt.h"
diff -r a7222d7fb7a8 -r 4963e22a267a master/fsm_sii.h
--- a/master/fsm_sii.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/fsm_sii.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef __EC_FSM_SII__
-#define __EC_FSM_SII__
+#ifndef __EC_FSM_SII_H__
+#define __EC_FSM_SII_H__
 
 #include "globals.h"
 #include "../include/ecrt.h"
diff -r a7222d7fb7a8 -r 4963e22a267a master/fsm_slave_config.h
--- a/master/fsm_slave_config.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/fsm_slave_config.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef __EC_FSM_SLAVE_CONFIG__
-#define __EC_FSM_SLAVE_CONFIG__
+#ifndef __EC_FSM_SLAVE_CONFIG_H__
+#define __EC_FSM_SLAVE_CONFIG_H__
 
 #include "../include/ecrt.h"
 
diff -r a7222d7fb7a8 -r 4963e22a267a master/fsm_slave_scan.h
--- a/master/fsm_slave_scan.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/fsm_slave_scan.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef __EC_FSM_SLAVE_SCAN__
-#define __EC_FSM_SLAVE_SCAN__
+#ifndef __EC_FSM_SLAVE_SCAN_H__
+#define __EC_FSM_SLAVE_SCAN_H__
 
 #include "../include/ecrt.h"
 
diff -r a7222d7fb7a8 -r 4963e22a267a master/globals.h
--- a/master/globals.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/globals.h	Thu Apr 03 15:49:24 2008 +0000
@@ -37,8 +37,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_MASTER_GLOBALS_
-#define _EC_MASTER_GLOBALS_
+#ifndef __EC_MASTER_GLOBALS_H__
+#define __EC_MASTER_GLOBALS_H__
 
 #include <linux/types.h>
 
diff -r a7222d7fb7a8 -r 4963e22a267a master/mailbox.h
--- a/master/mailbox.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/mailbox.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_MAILBOX_H_
-#define _EC_MAILBOX_H_
+#ifndef __EC_MAILBOX_H__
+#define __EC_MAILBOX_H__
 
 #include "slave.h"
 
diff -r a7222d7fb7a8 -r 4963e22a267a master/master.h
--- a/master/master.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/master.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_MASTER_H_
-#define _EC_MASTER_H_
+#ifndef __EC_MASTER_H__
+#define __EC_MASTER_H__
 
 #include <linux/list.h>
 #include <linux/sysfs.h>
diff -r a7222d7fb7a8 -r 4963e22a267a master/pdo.h
--- a/master/pdo.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/pdo.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_PDO_H_
-#define _EC_PDO_H_
+#ifndef __EC_PDO_H__
+#define __EC_PDO_H__
 
 #include <linux/list.h>
 
diff -r a7222d7fb7a8 -r 4963e22a267a master/pdo_list.h
--- a/master/pdo_list.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/pdo_list.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_PDO_LIST_H_
-#define _EC_PDO_LIST_H_
+#ifndef __EC_PDO_LIST_H__
+#define __EC_PDO_LIST_H__
 
 #include <linux/list.h>
 
diff -r a7222d7fb7a8 -r 4963e22a267a master/slave.h
--- a/master/slave.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/slave.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_SLAVE_H_
-#define _EC_SLAVE_H_
+#ifndef __EC_SLAVE_H__
+#define __EC_SLAVE_H__
 
 #include <linux/list.h>
 #include <linux/kobject.h>
diff -r a7222d7fb7a8 -r 4963e22a267a master/slave_config.h
--- a/master/slave_config.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/slave_config.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_SLAVE_CONFIG_H_
-#define _EC_SLAVE_CONFIG_H_
+#ifndef __EC_SLAVE_CONFIG_H__
+#define __EC_SLAVE_CONFIG_H__
 
 #include <linux/list.h>
 #include <linux/kobject.h>
diff -r a7222d7fb7a8 -r 4963e22a267a master/sync.h
--- a/master/sync.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/sync.h	Thu Apr 03 15:49:24 2008 +0000
@@ -37,8 +37,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_SYNC_H_
-#define _EC_SYNC_H_
+#ifndef __EC_SYNC_H__
+#define __EC_SYNC_H__
 
 #include <linux/list.h>
 
diff -r a7222d7fb7a8 -r 4963e22a267a master/xmldev.h
--- a/master/xmldev.h	Thu Apr 03 15:31:34 2008 +0000
+++ b/master/xmldev.h	Thu Apr 03 15:49:24 2008 +0000
@@ -38,8 +38,8 @@
 
 /*****************************************************************************/
 
-#ifndef _EC_XMLDEV_H_
-#define _EC_XMLDEV_H_
+#ifndef __EC_XMLDEV_H__
+#define __EC_XMLDEV_H__
 
 #include <linux/fs.h>
 #include <linux/cdev.h>