From 23973bae24b7f569e26c7f869a103aacbaf66ab2 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Sun, 15 Apr 2012 19:28:44 +0000
Subject: A few tweaks to make Ardour build in GCC -std=c++0x mode.

git-svn-id: svn://localhost/ardour2/branches/3.0@11983 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/editor_xpms | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gtk2_ardour/editor_xpms')

diff --git a/gtk2_ardour/editor_xpms b/gtk2_ardour/editor_xpms
index cb4a044cfd..c8b4e83a0c 100644
--- a/gtk2_ardour/editor_xpms
+++ b/gtk2_ardour/editor_xpms
@@ -3,7 +3,7 @@
 #define fader_cursor_height 25
 #define fader_cursor_x_hot 3
 #define fader_cursor_y_hot 21
-static const gchar fader_cursor_bits[] = {
+static const unsigned char fader_cursor_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00,
    0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0x02, 0x01,
    0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01,
@@ -15,7 +15,7 @@ static const gchar fader_cursor_bits[] = {
    0x00, 0x00, 0x00, 0x00 };
 
 /* Created with The GIMP */
-static const gchar fader_cursor_mask_bits[] = {
+static const unsigned char fader_cursor_mask_bits[] = {
    0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x78, 0x00,
    0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01,
    0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01,
@@ -31,7 +31,7 @@ static const gchar fader_cursor_mask_bits[] = {
 #define speaker_cursor_height 26
 #define speaker_cursor_x_hot 0
 #define speaker_cursor_y_hot 0
-static const gchar speaker_cursor_bits[] = {
+static const unsigned char speaker_cursor_bits[] = {
    0x00, 0xc0, 0x00, 0xc0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xcc, 0x00, 0xcc,
    0xff, 0xc3, 0xff, 0xc3, 0x03, 0xc0, 0x03, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0,
    0xc3, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0, 0xc3, 0xc0, 0x03, 0xc0, 0x03, 0xc0,
@@ -42,7 +42,7 @@ static const gchar speaker_cursor_bits[] = {
 #define speaker_cursor_mask_height 26
 #define speaker_cursor_mask_x_hot 0
 #define speaker_cursor_mask_y_hot 0
-static const gchar speaker_cursor_mask_bits[] = {
+static const unsigned char speaker_cursor_mask_bits[] = {
    0x00, 0xc0, 0x00, 0xc0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xfc, 0x00, 0xfc,
    0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff,
    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x3f, 0xff,
@@ -85,7 +85,7 @@ static const short cursor_timestretch_mask_bits[] = {
 #define cursor_zoom_height 16
 #define cursor_zoom_x_hot 6
 #define cursor_zoom_y_hot 6
-static const short cursor_zoom_bits[] = {
+static const unsigned short cursor_zoom_bits[] = {
    0x00e0, 0x0000, 0x03b8, 0x0000, 0x0604, 0x0000, 0x0806, 0x0000, 0x0842,
    0x0000, 0x1843, 0x0000, 0x11f1, 0x0000, 0x1843, 0x0000, 0x0842, 0x0000,
    0x1806, 0x0000, 0x2604, 0x0000, 0x4758, 0x0000, 0x88e0, 0x0000, 0x1000,
@@ -95,7 +95,7 @@ static const short cursor_zoom_bits[] = {
 #define cursor_zoom_mask_height 16
 #define cursor_zoom_mask_x_hot 6
 #define cursor_zoom_mask_y_hot 6
-static const short cursor_zoom_mask_bits[] = {
+static const unsigned short cursor_zoom_mask_bits[] = {
    0x00e0, 0x0000, 0x03f8, 0x0000, 0x07fc, 0x0000, 0x0ffe, 0x0000, 0x0ffe,
    0x0000, 0x1fff, 0x0000, 0x1fff, 0x0000, 0x1fff, 0x0000, 0x0ffe, 0x0000,
    0x1ffe, 0x0000, 0x3ffc, 0x0000, 0x7ff8, 0x0000, 0xf8e0, 0x0000, 0xf000,
-- 
cgit v1.2.3