commit 833ae9210c8d242a46f92258068b8f20f0bf4b29
parent 8a56b78f5ed534178517ade114bb664e24fa8e58
Author: Tristan Chabredier <wwp@claws-mail.org>
Date: Sat, 9 Feb 2008 13:01:24 +0000
2008-02-09 [wwp] 3.3.0cvs2
* src/main.c
Fix compiling issue w/ non-gcc/C99 compilers (suncc).
Diffstat:
4 files changed, 68 insertions(+), 26 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-09 [wwp] 3.3.0cvs2
+
+ * src/main.c
+ Fix compiling issue w/ non-gcc/C99 compilers (suncc).
+
2008-02-08 [colin] 3.3.0cvs1
* src/common/utils.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3215,3 +3215,4 @@
( cvs diff -u -r 1.94.2.169 -r 1.94.2.170 src/messageview.c; cvs diff -u -r 1.83.2.126 -r 1.83.2.127 src/mimeview.c; cvs diff -u -r 1.20.2.23 -r 1.20.2.24 src/mimeview.h; ) > 3.2.0cvs76.patchset
( cvs diff -u -r 1.100.2.59 -r 1.100.2.60 AUTHORS; cvs diff -u -r 1.654.2.3272 -r 1.654.2.3274 configure.ac; cvs diff -u -r 1.9.2.12 -r 1.9.2.13 po/cs.po; cvs diff -u -r 1.58.2.36 -r 1.58.2.37 po/de.po; cvs diff -u -r 1.60.2.50 -r 1.60.2.51 po/es.po; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 po/fi.po; diff -u /dev/null po/he.po; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 po/hu.po; cvs diff -u -r 1.34.2.25 -r 1.34.2.26 po/it.po; cvs diff -u -r 1.50.2.29 -r 1.50.2.30 po/pt_BR.po; cvs diff -u -r 1.5.2.26 -r 1.5.2.27 po/zh_CN.po; cvs diff -u -r 1.4.2.59 -r 1.4.2.60 src/gtk/about.c; cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/gtk/authors.h; ) > 3.2.0cvs77.patchset
( cvs diff -u -r 1.36.2.134 -r 1.36.2.135 src/common/utils.c; ) > 3.3.0cvs1.patchset
+( cvs diff -u -r 1.115.2.184 -r 1.115.2.185 src/main.c; ) > 3.3.0cvs2.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/main.c b/src/main.c
@@ -815,60 +815,96 @@ static void win32_close_log(void)
#endif
static void main_dump_features_list(gboolean show_debug_only)
-/* display compiled-in features list using output_func (commonly any
- g_print-like function) */
+/* display compiled-in features list */
{
if (show_debug_only && !debug_get_mode())
return;
-#define debug_print_cond(format, ...) \
- if (show_debug_only) \
- debug_print(format, ## __VA_ARGS__); \
- else \
- g_print(format, ## __VA_ARGS__);
-
- debug_print_cond("GTK+ %d.%d.%d / GLib %d.%d.%d\n",
- gtk_major_version, gtk_minor_version, gtk_micro_version,
- glib_major_version, glib_minor_version, glib_micro_version);
- debug_print_cond("Compiled-in features:\n");
+ if (show_debug_only)
+ debug_print("GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version,
+ glib_major_version, glib_minor_version, glib_micro_version);
+ else
+ g_print("GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version,
+ glib_major_version, glib_minor_version, glib_micro_version);
+ if (show_debug_only)
+ debug_print("Compiled-in features:\n");
+ else
+ g_print("Compiled-in features:\n");
#if HAVE_LIBCOMPFACE
- debug_print_cond(" compface\n");
+ if (show_debug_only)
+ debug_print(" compface\n");
+ else
+ g_print(" compface\n");
#endif
#if USE_ASPELL
- debug_print_cond(" aspell\n");
+ if (show_debug_only)
+ debug_print(" aspell\n");
+ else
+ g_print(" aspell\n");
#endif
#if USE_GNUTLS
- debug_print_cond(" gnutls\n");
+ if (show_debug_only)
+ debug_print(" gnutls\n");
+ else
+ g_print(" gnutls\n");
#endif
#if INET6
- debug_print_cond(" ipv6\n");
+ if (show_debug_only)
+ debug_print(" ipv6\n");
+ else
+ g_print(" ipv6\n");
#endif
#if HAVE_ICONV
- debug_print_cond(" iconv\n");
+ if (show_debug_only)
+ debug_print(" iconv\n");
+ else
+ g_print(" iconv\n");
#endif
#if USE_JPILOT
- debug_print_cond(" jpilot\n");
+ if (show_debug_only)
+ debug_print(" jpilot\n");
+ else
+ g_print(" jpilot\n");
#endif
#if USE_LDAP
- debug_print_cond(" ldap\n");
+ if (show_debug_only)
+ debug_print(" ldap\n");
+ else
+ g_print(" ldap\n");
#endif
#if HAVE_LIBETPAN
- debug_print_cond(" libetpan %d.%d\n", LIBETPAN_VERSION_MAJOR, LIBETPAN_VERSION_MINOR);
+ if (show_debug_only)
+ debug_print(" libetpan %d.%d\n", LIBETPAN_VERSION_MAJOR, LIBETPAN_VERSION_MINOR);
+ else
+ g_print(" libetpan %d.%d\n", LIBETPAN_VERSION_MAJOR, LIBETPAN_VERSION_MINOR);
#endif
#if USE_GNOMEPRINT
- debug_print_cond(" gnomeprint\n");
+ if (show_debug_only)
+ debug_print(" gnomeprint\n");
+ else
+ g_print(" gnomeprint\n");
#endif
#if HAVE_LIBSM
- debug_print_cond(" libsm\n");
+ if (show_debug_only)
+ debug_print(" libsm\n");
+ else
+ g_print(" libsm\n");
#endif
#if HAVE_NETWORKMANAGER_SUPPORT
- debug_print_cond(" NetworkManager\n");
+ if (show_debug_only)
+ debug_print(" NetworkManager\n");
+ else
+ g_print(" NetworkManager\n");
#endif
#if USE_OPENSSL
- debug_print_cond(" openssl\n");
+ if (show_debug_only)
+ debug_print(" openssl\n");
+ else
+ g_print(" openssl\n");
#endif
}
-#undef debug_print_cond
int main(int argc, char *argv[])
{
