From 3d4def25f019a1967103d361069ff1cc6e923c42 Mon Sep 17 00:00:00 2001 From: Yves Rizoud Date: Wed, 26 Nov 2008 21:56:36 +0000 Subject: [PATCH] More Haiku fixes (gcc v2 support, actually)cf. Issue 61 git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@364 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- Makefile | 6 +++--- readline.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6afe9988..a2034aef 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ ifdef COMSPEC MKDIR = mkdir /s BIN = grafx2.exe CFGBIN = gfxcfg.exe - COPT = -W -Wall -O -g -ggdb `sdl-config --cflags` $(TTFCOPT) + COPT = -W -Wall -Wdeclaration-after-statement -O -g -ggdb `sdl-config --cflags` $(TTFCOPT) LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) CC = gcc OBJDIR = obj/win32 @@ -83,13 +83,13 @@ else CC = i586-mingw32msvc-gcc BIN = grafx2.exe CFGBIN = gfxcfg.exe - COPT = -W -Wall -O -g -ggdb -Dmain=SDL_main `/usr/local/cross-tools/i386-mingw32/bin/sdl-config --cflags` $(TTFCOPT) + COPT = -W -Wall -Wdeclaration-after-statement -O -g -ggdb -Dmain=SDL_main `/usr/local/cross-tools/i386-mingw32/bin/sdl-config --cflags` $(TTFCOPT) LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi `/usr/local/cross-tools/i386-mingw32/bin/sdl-config --libs` -lSDL_image $(TTFLOPT) OBJDIR = obj/win32 else BIN = grafx2 CFGBIN = gfxcfg - COPT = -W -Wall -c -g `sdl-config --cflags` $(TTFCOPT) + COPT = -W -Wall -Wdeclaration-after-statement -c -g `sdl-config --cflags` $(TTFCOPT) LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) CC = gcc OBJDIR = obj/unix diff --git a/readline.c b/readline.c index 0e961041..abcb1162 100644 --- a/readline.c +++ b/readline.c @@ -83,11 +83,11 @@ int CaractereValide(int Caractere) #else char CaracteresInterdits[] = {'/', '|', '?', '*', '<', '>'}; #endif + int Position; if (Caractere < ' ' || Caractere > 255) return 0; - int Position; for (Position=0; Position<(long)sizeof(CaracteresInterdits); Position++) if (Caractere == CaracteresInterdits[Position]) return 0;