gmacros.h: add G_GNUC_*_IGNORE_DEPRECATIONS macros for clang

[platform/upstream/glib.git] / glib / gstrfuncs.h

diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
index 43bc924..41fc839 100644 (file)
--- a/glib/gstrfuncs.h
+++ b/glib/gstrfuncs.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -221,8 +219,7 @@ gchar*                    g_strdup_printf  (const gchar *format,
                                        ...) G_GNUC_PRINTF (1, 2) G_GNUC_MALLOC;
 GLIB_AVAILABLE_IN_ALL
 gchar*               g_strdup_vprintf (const gchar *format,
-                                       va_list      args) G_GNUC_PRINTF(1, 0)
-                                       G_GNUC_MALLOC;
+                                       va_list      args) G_GNUC_PRINTF(1, 0) G_GNUC_MALLOC;
 GLIB_AVAILABLE_IN_ALL
 gchar*               g_strndup        (const gchar *str,
                                        gsize        n) G_GNUC_MALLOC;  
@@ -290,6 +287,20 @@ GLIB_AVAILABLE_IN_ALL
 gchar*                g_stpcpy         (gchar        *dest,
                                         const char   *src);
 
+GLIB_AVAILABLE_IN_2_40
+gchar *                 g_str_to_ascii                                  (const gchar   *str,
+                                                                         const gchar   *from_locale);
+
+GLIB_AVAILABLE_IN_2_40
+gchar **                g_str_tokenize_and_fold                         (const gchar   *string,
+                                                                         const gchar   *translit_locale,
+                                                                         gchar       ***ascii_alternates);
+
+GLIB_AVAILABLE_IN_2_40
+gboolean                g_str_match_string                              (const gchar   *search_term,
+                                                                         const gchar   *potential_hit,
+                                                                         gboolean       accept_alternates);
+
 G_END_DECLS
 
 #endif /* __G_STRFUNCS_H__ */