diff --git a/src/charset.h b/src/charset.h
index e64eb19adad66c0fdf0d70959b903215600e6b94..1fa5ec4fdac4b289674e0b670b19691cc8598c58 100644 (file)
--- a/src/charset.h
+++ b/src/charset.h
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
* Project homepage: http://musicpd.org
-
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
-
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
-
+ *
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
#ifndef CHARSET_H
#define CHARSET_H
#include "config.h"
-
-#include <glib.h>
+#include "Compiler.h"
#include <stdbool.h>
/**
* Returns the number of terminal cells occupied by this string.
*/
-G_GNUC_PURE
+gcc_pure
unsigned
utf8_width(const char *str);
+/**
+ * Returns the number of terminal cells occupied by this string.
+ */
+gcc_pure
+unsigned
+locale_width(const char *p);
+
/**
* Limits the width of the specified string. Cuts it off before the
* specified width is exceeded.