* edit.h: Renamed multiple inclusion guards that started with a

double underscore. Added #includes for dependent files.
	* editcmddef.h: Likewise.
	* editlock.h: Likewise.
	* edit-widget.h: Likewise.

edit/ChangeLog

@@ -1,3 +1,11 @@
+2004-12-03  Roland Illig  <roland.illig@gmx.de>
+
+	* edit.h: Renamed multiple inclusion guards that started with a
+	double underscore. Added #includes for dependent files.
+	* editcmddef.h: Likewise.
+	* editlock.h: Likewise.
+	* edit-widget.h: Likewise.
+
 2004-12-02  Roland Illig  <roland.illig@gmx.de>
 
 	* editcmd.c (edit_replace_cmd): Separated input and output arguments.

edit/edit-widget.h

@@ -1,7 +1,8 @@
-#ifndef __EDIT_WIDGET_H
-#define __EDIT_WIDGET_H
+#ifndef MC_EDIT_WIDGET_H
+#define MC_EDIT_WIDGET_H
 
 #include "../src/dialog.h"		/* Widget */
+#include "edit.h"
 
 #define MAX_MACRO_LENGTH 1024
 #define N_LINE_CACHES 32
@@ -103,4 +104,4 @@ struct WEdit {
     struct macro macro[MAX_MACRO_LENGTH];
 };
 
-#endif				/* !__EDIT_WIDGET_H */
+#endif

edit/edit.h

@@ -20,8 +20,8 @@
    02111-1307, USA.
 */
 
-#ifndef __EDIT_H
-#define __EDIT_H
+#ifndef MC_EDIT_H
+#define MC_EDIT_H
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -332,4 +332,4 @@ extern int column_highlighting;
 #define BLOCK_FILE         EDIT_DIR PATH_SEP_STR "cooledit.block"
 #define TEMP_FILE          EDIT_DIR PATH_SEP_STR "cooledit.temp"
 
-#endif 				/* __EDIT_H */
+#endif

edit/editcmddef.h

@@ -1,5 +1,5 @@
-#ifndef __EDIT_CMD_DEF_H
-#define __EDIT_CMD_DEF_H
+#ifndef MC_EDIT_CMD_DEF_H
+#define MC_EDIT_CMD_DEF_H
 
 /*  in the distant future, keyboards will be invented with a
     separate key for each one of these commands   *sigh*      */
@@ -168,4 +168,4 @@
 #define CK_Macro(i)		((i) | (1 << 17))
 #define IS_MACRO_COMMAND(i)	((i) & (1 << 17))
 
-#endif /* !__EDIT_CMD_DEF_H */
+#endif

edit/editlock.h

@@ -1,7 +1,7 @@
-#ifndef __EDIT_LOCK_H
-#define __EDIT_LOCK_H
+#ifndef MC_EDIT_LOCK_H
+#define MC_EDIT_LOCK_H
 
 int edit_lock_file (const char *fname);
 int edit_unlock_file (const char *fname);
 
-#endif				/* !__EDIT_LOCK_H */
+#endif