m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build under HAiku/gcc2.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1473 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2010-05-05 18:05:20 +00:00
parent 9644f7fb4a
commit aeec8451dc
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -153,7 +153,7 @@ else
CP = cp CP = cp
BIN = ../bin/grafx2 BIN = ../bin/grafx2
COPT = -W -Wall -c -g `sdl-config --cflags` $(TTFCOPT) -I/boot/common/include COPT = -W -Wall -c -g `sdl-config --cflags` $(TTFCOPT) -I/boot/common/include
LOPT = `sdl-config --libs` -lSDL_image -lpng -ljpeg -lz $(TTFLOPT) LOPT = `sdl-config --libs` -lSDL_image -lpng -ljpeg -lz $(TTFLOPT) -lfreetype
CC = gcc CC = gcc
OBJDIR = ../obj/haiku OBJDIR = ../obj/haiku
ZIP = zip ZIP = zip

10
src/struct.h
View File

@ -323,11 +323,11 @@ typedef struct
byte Grid_XOR_color; ///< XOR value to apply for grid color. byte Grid_XOR_color; ///< XOR value to apply for grid color.
} T_Config; } T_Config;
// Structures utilisées pour les descriptions de pages et de liste de pages. // Structures utilisées pour les descriptions de pages et de liste de pages.
// Lorsqu'on gèrera les animations, il faudra aussi des listes de listes de // Lorsqu'on gérera les animations, il faudra aussi des listes de listes de
// pages. // pages.
// Ces structures sont manipulées à travers des fonctions de gestion du // Ces structures sont manipulées à travers des fonctions de gestion du
// backup dans "graph.c". // backup dans "graph.c".
/// This is the data for one step of Undo/Redo, for one image. /// This is the data for one step of Undo/Redo, for one image.
@ -350,7 +350,11 @@ typedef struct T_Page
byte Background_transparent; ///< Boolean, true if Layer 0 should have transparent pixels byte Background_transparent; ///< Boolean, true if Layer 0 should have transparent pixels
byte Transparent_color; ///< Index of transparent color. 0 to 255. byte Transparent_color; ///< Index of transparent color. 0 to 255.
byte Nb_layers; ///< Number of layers byte Nb_layers; ///< Number of layers
#if __GNUC__ < 3
byte * Image[0];
#else
byte * Image[]; ///< Pixel data for the (first layer of) image. byte * Image[]; ///< Pixel data for the (first layer of) image.
#endif
// Define as Image[0] if you have an old gcc which is not C99. // Define as Image[0] if you have an old gcc which is not C99.
// No field after Image[] ! Dynamic layer allocation for Image[1], [2] etc. // No field after Image[] ! Dynamic layer allocation for Image[1], [2] etc.
} T_Page; } T_Page;