Merge from emacs-23

[gnu-emacs] / src / emacs-icon.h

diff --git a/src/emacs-icon.h b/src/emacs-icon.h
index 37e061a6cc372cde8265fae0609570fb0441f79e..c11c26ee55a04e1fe3a1a26a344d6addc1e6bec5 100644 (file)
--- a/src/emacs-icon.h
+++ b/src/emacs-icon.h
@@ -23,7 +23,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Note that the GTK port uses gdk to display the icon, so Emacs need
    not have XPM support compiled in.  */
 #if (defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)) || defined (USE_GTK)
-static char * gnu_xpm_bits[] = {
+static const char * gnu_xpm_bits[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 255 2",
 /* colors */