The following commit has been merged in the master branch:
commit 5920d138105dc27eb6f4aec4de7b4d21bd219cdf
Author: Patrick Winnertz <win...@debian.org>
Date: Thu Feb 5 23:09:37 2009 +0100
First bunch of reverting stuff from mhl to switch back to glib
This removes the usage of stdbool.h in favour of mhl/tyes.h as we have to
revert everything one by one
Signed-off-by: Patrick Winnertz <win...@debian.org>
diff --git a/ChangeLog b/ChangeLog
index e395d88..3fd7ee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-05 Patrick Winnertz <win...@debian.org>
+
+ * reverted all mhl usage in files except escaping stuff
+
2009-02-04 Enrico Weigelt, metux ITS <weig...@metux.de>
* mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing
#239, #240)
diff --git a/edit/usermap.c b/edit/usermap.c
index 7914d75..b25cad9 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 29097c4..bf06d12 100644
--- a/edit/usermap.h
+++ b/edit/usermap.h
@@ -1,7 +1,7 @@
#ifndef MC_USERMAP_H
#define MC_USERMAP_H
-#include <stdbool.h>
+#include <mhl/types.h>
#define MC_USERMAP ".mc/cedit/cooledit.bindings"
diff --git a/src/ecs-test.c b/src/ecs-test.c
index 2493be9..963a63b 100644
--- a/src/ecs-test.c
+++ b/src/ecs-test.c
@@ -28,7 +28,8 @@
#include <assert.h>
#include <locale.h>
#include <stdio.h>
-#include <stdbool.h>
+
+#include <mhl/types.h>
#include "global.h"
#include "ecs.h"
diff --git a/src/ecs.c b/src/ecs.c
index cd8da0c..a38c54e 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 1a53c6f..98e9a9a 100644
--- a/src/ecs.h
+++ b/src/ecs.h
@@ -44,7 +44,7 @@ typedef char ecs_char;
# define ECS_STR(s) (s)
#endif
-#include <stdbool.h>
+#include <mhl/types.h>
/*
* String conversion functions between the wide character encoding and
diff --git a/src/file.c b/src/file.c
index ebd414e..1a367ea 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 564ed86..bf95b7f 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 3bf66de..1434fa7 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 60db3e6..a48dcfb 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 e8d81ec..cb08cb2 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 70dbfb6..44b40e5 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -28,7 +28,6 @@
#include <signal.h>
#include <stdarg.h>
-#include <stdbool.h>
#include <mhl/types.h>
diff --git a/src/tty.h b/src/tty.h
index b7ea928..f6d520b 100644
--- a/src/tty.h
+++ b/src/tty.h
@@ -25,7 +25,7 @@
#endif /* WANT_TERM_H */
#endif /* USE_NCURSES */
-#include <stdbool.h>
+#include <mhl/types.h>
/* {{{ Input }}} */
diff --git a/src/utilunix.c b/src/utilunix.c
index 71f839a..4cf70dc 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,6 +41,7 @@
#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 b00916a..dcd3559 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 e8f8be3..31afab6 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 772b1b7..d7596b1 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -1,7 +1,7 @@
#ifndef MC_WIDGET_H
#define MC_WIDGET_H
-#include <stdbool.h>
+#include <mhl/types.h>
#include "dialog.h" /* Widget */
diff --git a/src/x11conn.c b/src/x11conn.c
index 760842a..8505932 100644
--- a/src/x11conn.c
+++ b/src/x11conn.c
@@ -36,7 +36,6 @@ typedef int dummy; /* C99 forbids empty
compilation unit */
#include <setjmp.h>
#include <X11/Xlib.h>
-#include <stdbool.h>
#include <mhl/memory.h>
@@ -46,6 +45,8 @@ 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 23121ca..db0d945 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 75acfe4..980141d 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 f4cdcf5..75316bc 100644
--- a/vfs/utilvfs.h
+++ b/vfs/utilvfs.h
@@ -2,7 +2,8 @@
#define MC_VFS_UTILVFS_H
#include <sys/stat.h>
-#include <stdbool.h>
+
+#include <mhl/types.h>
/* Flags for vfs_split_url() */
#define URL_ALLOW_ANON 1
--
Midnight Commander Development
_______________________________________________
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
