From 06ef7a4190bea74090e0f7f602f95c004e505a7f Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Tue, 24 May 2016 09:38:11 +0000 Subject: [PATCH] trying to fix compile with GCC 6 --- Fltk/FlGui.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp index b8b8ad0e13..a9fac7ffd4 100644 --- a/Fltk/FlGui.cpp +++ b/Fltk/FlGui.cpp @@ -370,18 +370,18 @@ FlGui::FlGui(int argc, char **argv) // nothing to do here #else fl_open_display(); - static char gmsh32x32[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x40, 0x03, 0x00, - 0x00, 0x40, 0x03, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x20, 0x07, 0x00, - 0x00, 0x10, 0x0f, 0x00, 0x00, 0x10, 0x0f, 0x00, 0x00, 0x08, 0x1f, 0x00, - 0x00, 0x08, 0x1f, 0x00, 0x00, 0x04, 0x3f, 0x00, 0x00, 0x04, 0x3f, 0x00, - 0x00, 0x02, 0x7f, 0x00, 0x00, 0x02, 0x7f, 0x00, 0x00, 0x01, 0xff, 0x00, - 0x00, 0x01, 0xff, 0x00, 0x80, 0x00, 0xff, 0x01, 0x80, 0x00, 0xff, 0x01, - 0x40, 0x00, 0xff, 0x03, 0x40, 0x00, 0xff, 0x03, 0x20, 0x00, 0xff, 0x07, - 0x20, 0x00, 0xff, 0x07, 0x10, 0x00, 0xff, 0x0f, 0x10, 0x00, 0xff, 0x0f, - 0x08, 0x00, 0xff, 0x1f, 0x08, 0x00, 0xff, 0x1f, 0x04, 0x40, 0xfd, 0x3f, - 0x04, 0xa8, 0xea, 0x3f, 0x02, 0x55, 0x55, 0x7f, 0xa2, 0xaa, 0xaa, 0x7a, - 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00}; + static char *gmsh32x32 = + "\x00\x00\x00\x00\x00\x80\x01\x00\x00\x40\x03\x00\ + \x00\x40\x03\x00\x00\x20\x07\x00\x00\x20\x07\x00\ + \x00\x10\x0f\x00\x00\x10\x0f\x00\x00\x08\x1f\x00\ + \x00\x08\x1f\x00\x00\x04\x3f\x00\x00\x04\x3f\x00\ + \x00\x02\x7f\x00\x00\x02\x7f\x00\x00\x01\xff\x00\ + \x00\x01\xff\x00\x80\x00\xff\x01\x80\x00\xff\x01\ + \x40\x00\xff\x03\x40\x00\xff\x03\x20\x00\xff\x07\ + \x20\x00\xff\x07\x10\x00\xff\x0f\x10\x00\xff\x0f\ + \x08\x00\xff\x1f\x08\x00\xff\x1f\x04\x40\xfd\x3f\ + \x04\xa8\xea\x3f\x02\x55\x55\x7f\xa2\xaa\xaa\x7a\ + \xff\xff\xff\xff\x00\x00\x00\x00"; graph[0]->getWindow()->icon ((const char*)XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display), gmsh32x32, 32, 32)); -- GitLab