GNOME.org
 

updated: [0c97636] fixed #240

The following commit has been merged in the master branch:
commit 0c976362125a42ead215d11251fe0ebbd8ddf8ef
Author: Enrico Weigelt, metux IT service <weigelt metux de>
Date:   Tue Feb 3 18:21:16 2009 +0100

    fixed #240

diff --git a/ChangeLog b/ChangeLog
index 4826718..47749be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 	* edit/editcmd.c, configure.ac: removed obsolete own implementation of memove (#242)
 	* mhl/escape.h: including stdbool.h for the bool type (fixing #239)
 	* mhl/types.h: removed redundant bool type (fixing #239)
+	* replaced bool type in mhl/types.h by stdbool.h (fixing #240)
 
 2009-02-01 Enrico Weigelt, metux ITS <weigelt metux de>
 
diff --git a/edit/usermap.c b/edit/usermap.c
index b25cad9..7914d75 100644
--- a/edit/usermap.c
+++ b/edit/usermap.c
@@ -29,8 +29,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <stdbool.h>
 
-#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/edit/usermap.h b/edit/usermap.h
index bf06d12..29097c4 100644
--- a/edit/usermap.h
+++ b/edit/usermap.h
@@ -1,7 +1,7 @@
 #ifndef MC_USERMAP_H
 #define MC_USERMAP_H
 
-#include <mhl/types.h>
+#include <stdbool.h>
 
 #define MC_USERMAP ".mc/cedit/cooledit.bindings"
 
diff --git a/src/ecs-test.c b/src/ecs-test.c
index 963a63b..2493be9 100644
--- a/src/ecs-test.c
+++ b/src/ecs-test.c
@@ -28,8 +28,7 @@
 #include <assert.h>
 #include <locale.h>
 #include <stdio.h>
-
-#include <mhl/types.h>
+#include <stdbool.h>
 
 #include "global.h"
 #include "ecs.h"
diff --git a/src/ecs.c b/src/ecs.c
index a38c54e..cd8da0c 100644
--- a/src/ecs.c
+++ b/src/ecs.c
@@ -26,8 +26,8 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <stdbool.h>
 
-#include <mhl/types.h>
 #include <mhl/string.h>
 
 #include "global.h"
diff --git a/src/ecs.h b/src/ecs.h
index 98e9a9a..1a53c6f 100644
--- a/src/ecs.h
+++ b/src/ecs.h
@@ -44,7 +44,7 @@ typedef char ecs_char;
 #  define ECS_STR(s)		(s)
 #endif
 
-#include <mhl/types.h>
+#include <stdbool.h>
 
 /*
  * String conversion functions between the wide character encoding and
diff --git a/src/file.c b/src/file.c
index 1a367ea..ebd414e 100644
--- a/src/file.c
+++ b/src/file.c
@@ -48,8 +48,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <stdbool.h>
 
-#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/escape.h>
 #include <mhl/string.h>
diff --git a/src/find.c b/src/find.c
index bf95b7f..564ed86 100644
--- a/src/find.c
+++ b/src/find.c
@@ -26,8 +26,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <stdbool.h>
 
-#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/src/key.c b/src/key.c
index 1434fa7..3bf66de 100644
--- a/src/key.c
+++ b/src/key.c
@@ -31,8 +31,8 @@
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <stdbool.h>
 
-#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/src/logging.c b/src/logging.c
index a48dcfb..60db3e6 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -25,9 +25,9 @@
 
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdbool.h>
 
 #include <mhl/memory.h>
-#include <mhl/types.h>
 
 #include "global.h"
 #include "logging.h"
diff --git a/src/treestore.c b/src/treestore.c
index cb08cb2..e8d81ec 100644
--- a/src/treestore.c
+++ b/src/treestore.c
@@ -40,8 +40,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <stdbool.h>
 
-#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/src/tty.c b/src/tty.c
index 44b40e5..70dbfb6 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -28,6 +28,7 @@
 
 #include <signal.h>
 #include <stdarg.h>
+#include <stdbool.h>
 
 #include <mhl/types.h>
 
diff --git a/src/tty.h b/src/tty.h
index f6d520b..b7ea928 100644
--- a/src/tty.h
+++ b/src/tty.h
@@ -25,7 +25,7 @@
 #endif /* WANT_TERM_H */
 #endif /* USE_NCURSES */
 
-#include <mhl/types.h>
+#include <stdbool.h>
 
 /* {{{ Input }}} */
 
diff --git a/src/utilunix.c b/src/utilunix.c
index 4cf70dc..71f839a 100644
--- a/src/utilunix.c
+++ b/src/utilunix.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include <stdbool.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -41,7 +41,6 @@
 #endif
 #include <unistd.h>
 
-#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/src/view.c b/src/view.c
index dcd3559..b00916a 100644
--- a/src/view.c
+++ b/src/view.c
@@ -42,8 +42,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <stdbool.h>
 
-#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/src/widget.c b/src/widget.c
index 31afab6..e8f8be3 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -33,8 +33,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
+#include <stdbool.h>
 
-#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/src/widget.h b/src/widget.h
index d7596b1..772b1b7 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -1,7 +1,7 @@
 #ifndef MC_WIDGET_H
 #define MC_WIDGET_H
 
-#include <mhl/types.h>
+#include <stdbool.h>
 
 #include "dialog.h"		/* Widget */
 
diff --git a/src/x11conn.c b/src/x11conn.c
index 8505932..760842a 100644
--- a/src/x11conn.c
+++ b/src/x11conn.c
@@ -36,6 +36,7 @@ typedef int dummy;		/* C99 forbids empty compilation unit */
 
 #include <setjmp.h>
 #include <X11/Xlib.h>
+#include <stdbool.h>
 
 #include <mhl/memory.h>
 
@@ -45,8 +46,6 @@ typedef int dummy;		/* C99 forbids empty compilation unit */
 #  include <gmodule.h>
 #endif
 
-#include <mhl/types.h>
-
 #include "x11conn.h"
 
 /*** file scope type declarations **************************************/
diff --git a/vfs/smbfs.c b/vfs/smbfs.c
index db0d945..23121ca 100644
--- a/vfs/smbfs.c
+++ b/vfs/smbfs.c
@@ -25,8 +25,8 @@
 
 #include <stdio.h>
 #include <sys/types.h>
+#include <stdbool.h>
 
-#include <mhl/types.h>
 #include <mhl/string.h>
 
 #undef	USE_NCURSES	/* Don't include *curses.h */
diff --git a/vfs/utilvfs.c b/vfs/utilvfs.c
index 980141d..75acfe4 100644
--- a/vfs/utilvfs.c
+++ b/vfs/utilvfs.c
@@ -21,8 +21,8 @@
 #include <config.h>
 
 #include <ctype.h>
+#include <stdbool.h>
 
-#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/string.h>
 
diff --git a/vfs/utilvfs.h b/vfs/utilvfs.h
index 75316bc..f4cdcf5 100644
--- a/vfs/utilvfs.h
+++ b/vfs/utilvfs.h
@@ -2,8 +2,7 @@
 #define MC_VFS_UTILVFS_H
 
 #include <sys/stat.h>
-
-#include <mhl/types.h>
+#include <stdbool.h>
 
 /* Flags for vfs_split_url() */
 #define URL_ALLOW_ANON 1

-- 
Midnight Commander Development
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]