From 172fd07c3588f2eb41895277d4094edfd38e3ec8 Mon Sep 17 00:00:00 2001 From: Wen-Yen Chuang Date: Tue, 27 Dec 2011 09:19:35 +0800 Subject: [PATCH] * Make everything compatible with gcc -std=c1x --- ChangeLog | 7 +++++++ SHA1SUMS | 34 +++++++++++++++++----------------- po/ChangeLog | 8 ++++++++ src/file.c | 2 +- 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09ae04f..6305fdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-12-27 + + version UNRELEASED: + * Updated Japanese translation (Toshiharu Kudoh). + * Updated Russian translation (Aleksej Perepyolkin). + * Make everything compatible with gcc -std=c1x + 2011-12-09 version 0.8.18.1.6: diff --git a/SHA1SUMS b/SHA1SUMS index a7cdd67..aac112f 100644 --- a/SHA1SUMS +++ b/SHA1SUMS @@ -2,7 +2,7 @@ Hash: SHA1,SHA512 634071380936e4893b0e8cacdfcd344638406575 171 AUTHORS -5176007481c3e5a2ee645999616ffa0335a6d094 9773 ChangeLog +41064a7f3d01661f5de5cfee2345e3e9c6a8136a 9961 ChangeLog 0beb31ee37259edeb621d345db933f2c827b2a21 22 Makefile.am 32ae3f99a247e614dcad4cfb2156a8d992ab53d0 22228 Makefile.in 04dc937708d52f3b9b6f9a096898c5e23fb80ace 2071 README @@ -74,7 +74,7 @@ f9dc3d93b1d0256dc920a704c1cc7c3e42c852d0 2681 data/icons_another/40.png d30e962a3de2da09ab0a9a7979bee787922464a1 13663 install-sh 01a6b4bf79aca9b556822601186afab86e8c4fbf 26530 lgpl-2.1.txt aeef20c1028a7ac4b904dd51b4c40376eba21350 11419 missing -ead91d3c7d4c3ca3172041ce36e23ee487066902 6881 po/ChangeLog +c749145d16c43a17ed040cb5325353d04b0c5946 7069 po/ChangeLog 0640d6d14812d6323dbb683259046b95a6c0ceb5 169 po/LINGUAS ce1c3468fcd9afcacfb197457ae3c40ea97f585f 6911 po/Makefile.in.in 610fcd63bc842d466f948e96e625fb3927202b32 135 po/POTFILES.in @@ -128,7 +128,7 @@ ae0a6de60aa502b38ddcff3241998918ff81f438 6715 src/emacs.c 24279f8befe55dce2157382398c97c0040dcb3ac 956 src/emacs.h c3d84301cd67dcfd7396f60355f54f7c00945dbd 11332 src/encoding.c 6f7d53179676cfa352482a630f1d796a3a00f80c 1422 src/encoding.h -195d74bc98d69abe4f632a7cd3c50cc687ae27be 7723 src/file.c +5a59dd16fa54af326b06214c6587edefa95ef317 7716 src/file.c 5b9bcf1c3166b288777f78138278b843a22f6c28 1333 src/file.h 3fad59e8f43d96d6c45241c4697846bab6cc2e1a 2119 src/font.c 245c0fbc1d931b75e256e1410eeab2a12b56f75e 996 src/font.h @@ -160,18 +160,18 @@ bf524e4de2a68901495a91d181cf3573edd3027b 2532 src/window.c 75d1c79bfdd24b7ae5450ead4aef3ab43267e85f 1068 src/window.h -----BEGIN PGP SIGNATURE----- -iEYEARECAAYFAk70fbkACgkQdEpXpumNYVlCKACghvOSFNpJ6sISJ3AJV/Yia8Ac -NBEAnRXKADydAghs61asSvXlVpgstSh1iQIcBAEBCgAGBQJO9H25AAoJELc3H0m+ -i6gZeZgP+wSyKyBXKapqHJeFS0ZjO3+9LrOnNE0ogmjs9RhtKRLlqlHzODyCDeVh -4Qaba1dGhDJwjCItKnk1vJHsyiP5aGTgY3emyOqr2S0ysd2qSf59b6/OYZXkx6q/ -85Aeh/+eED4rpwFXzqejB/gNcEYyubdb/yYGhliWv4iLfMmT5LvpLiVfEy3tds7E -jT3aw+ubLgul1hIm/4hmRUQ9DYf+zxxJUL/T35fcuhhRBlh2iBJsu8l78MtBdfmD -XlhHk31Bi73vwQXYbztgCtpH4ugFrLjyk4+oNMnlmd0X2hRJUXhVOIgpaWi8ipI6 -mUsl2bmUSLfyu926uGx/4oPQwC3yIBbqFtexXUtNQ6YbSJZrB2+GHWfX6XzISs1L -gE4aouanFH+NZ2hNt36McIQs2xveN0qDkEeyQQ4iyIswZ9q2e1Q39Ej73O110V9+ -x0oS6bPp3DplzTZ5E65z1hR2mbqRGpkBKIrYP4jOTs1OIx13XNbnwmIsW7XHlI3U -wpO0TvtHmY0Y5N2uMVrv878UmpU7u3caJkLOoTV1e1AAaCgdDNO/YsaU4uLN6tci -W3e0bjbMn9Hdh8nbcTVBP/NiOx0ueDfoRbrOVH1tZoAyooMeemtiP7oJ1wbPvQ7E -KmKB2nNYz72mikPqmA/sQAT958jwi+S9j6nhD8z63wTN3lW6xQ7U -=TgzH +iEYEARECAAYFAk75HM0ACgkQdEpXpumNYVnmpgCdHIOBWvLd5Bjb4DeocKpqabmW +Zn4AoIfSil8IV+v06CTsj/4Rky3BYEt3iQIcBAEBCgAGBQJO+RzNAAoJELc3H0m+ +i6gZs1gP/iF1siVF/ROcK6NREqF8lkSXopLUnsP6E6QZR71Bb1G+PEKLblehe5Jf +n/EOca+u56eGsJ0aPm+p8+Um9OJWb1/e/JP+4UdKQqKQGVGexQXlrOJ6ykHhOvWy +ASK1g0FDN2dkGcmfidJzifhEIeVw7xuxqwDRw/NFaaMpMGM0sCQEz3AbOdFNr5T/ +IRuahpR6qRdZRQn3SdqjiJ6HK3o68TsyjBsTomk8IWvTreOiGdMNrXZnEvkILxUT +lDcf92/HQ15pCpSlIrCGjR8JDym7v9JUU2szzV5ArK3M69+oiXyx2ex1Y8M2+nfc +mqyjqS4roaaTf5v5ajx7q29WNq1aC+2PNhPhINQwzwSmBy4DwUgs8PpMtC7ZGGtj +VOhpQvM52RD16Ea0fbkYnHWo7WbEA1ByB+jE2jfKbd/5G1+d2vHE0+tJNEXvVgh1 +WLEKRV6fdWR4geHvI97Qj6hAIniXrbQr/2BdeayYbfVIRALxyClibqqIyR1RZmmQ +QbqPZAKzU3tcu3fwgg8cxCJ8+BoC43PyWqKl71zWc/WcdWELSgX4nQhxJmesNhrP +Yfd4iEy+pu26m9shR3wp63BrxeTeiqVsaej+tfpwzCqoCQCm+1w2MkWzOe94iw/J +BCuv+7dWFYwET5A/rAWEsA+elMjegHmYRv37kHTPwji7rDnPn9TQ +=zo73 -----END PGP SIGNATURE----- diff --git a/po/ChangeLog b/po/ChangeLog index 3c94912..2263d85 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,11 @@ +2011-12-22 Aleksej Perepyolkin + + * ru.po: Updated Russian translation. + +2011-12-10 Toshiharu Kudoh + + * ja.po: Updated Japanese translation. + 2010-12-07 Jorma Karvonen * fi.po: Updated Finnish translation. diff --git a/src/file.c b/src/file.c index 8fe8d82..e9293a5 100644 --- a/src/file.c +++ b/src/file.c @@ -232,7 +232,7 @@ gint file_save_real(GtkWidget *view, FileInfo *fi) #if ENABLE_STATISTICS void text_stats(gchar * text, gint * wc, gint * lc); gint skipDelim(gchar ** pos); -inline gboolean isDelim(gchar); +gboolean isDelim(gchar); gchar * file_stats(GtkWidget *view, FileInfo *fi) {