From 91d4dc20b9a33136dfde9082aeabb23dc6b0e88e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 28 Jan 2009 22:12:28 +0000 Subject: [PATCH] Fixes for compiling under freebsd git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@562 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- aide.c | 4 ++-- clavier.c | 4 ++-- divers.c | 4 ++-- graph.c | 2 +- init.c | 2 +- main.c | 2 ++ mountlist.c | 4 ++-- pages.c | 6 +++--- sdlscreen.c | 2 +- setup.c | 2 ++ 10 files changed, 18 insertions(+), 14 deletions(-) diff --git a/aide.c b/aide.c index 5fbd770a..abc1cc8a 100644 --- a/aide.c +++ b/aide.c @@ -26,7 +26,7 @@ #if defined(__WIN32__) #include -#elif defined(__macosx__) +#elif defined(__macosx__) || defined(__FreeBSD__) #include #include #elif defined (__linux__) @@ -417,7 +417,7 @@ void Bouton_Stats(void) GetDiskFreeSpaceEx(Principal_Repertoire_courant,&tailleU,NULL,NULL); Taille = tailleU.QuadPart; } -#elif defined(__linux__) || (__macosx__) +#elif defined(__linux__) || defined(__macosx__) || defined(__FreeBSD) // Note: under MacOSX, both macros are defined anyway. { struct statfs Informations_Disque; diff --git a/clavier.c b/clavier.c index 5e052b81..26102698 100644 --- a/clavier.c +++ b/clavier.c @@ -470,7 +470,7 @@ word Conversion_ANSI(SDL_keysym Sym) // This part was removed from the MacOSX port, but I put it back for others // as on Linux and Windows, it's what allows editing a text line with the keys // SDLK_LEFT, SDLK_RIGHT, SDLK_HOME, SDLK_END etc. - #ifndef __macosx__ + #if !(defined(__macosx__) || defined(__FreeBSD__)) if ( Sym.unicode == 0) { return Sym.sym; @@ -546,7 +546,7 @@ word Conversion_ANSI(SDL_keysym Sym) // Touche entre 127 et 255 if (Sym.unicode<256) { -#ifdef __macosx__ +#if defined(__macosx__) || defined(__FreeBSD__) // fc: Looks like there's a mismatch with delete & backspace // i don't why SDLK_DELETE was returned instead of SDLK_BACKSPACE if(Sym.unicode == 127) diff --git a/divers.c b/divers.c index d1d14f40..91c725e5 100644 --- a/divers.c +++ b/divers.c @@ -673,7 +673,7 @@ void Zoomer_une_ligne(byte* Ligne_originale, byte* Ligne_zoomee, #if defined(__WIN32__) #define _WIN32_WINNT 0x0500 #include -#elif defined(__macosx__) +#elif defined(__macosx__) || defined(__FreeBSD__) #include #elif defined(__BEOS__) || defined(__HAIKU__) // sysinfo not implemented @@ -701,7 +701,7 @@ unsigned long Memoire_libre(void) mstt.dwLength = sizeof(MEMORYSTATUSEX); GlobalMemoryStatusEx(&mstt); return mstt.ullAvailPhys; - #elif defined(__macosx__) + #elif defined(__macosx__) || defined(__FreeBSD__) int mib[2]; int maxmem; size_t len; diff --git a/graph.c b/graph.c index c3e6d7e3..1da799c4 100644 --- a/graph.c +++ b/graph.c @@ -1341,7 +1341,7 @@ void Tracer_rectangle_vide(short Debut_X,short Debut_Y,short Fin_X,short Fin_Y,b for (Pos_X=Debut_X;Pos_X<=Fin_X;Pos_X++) Afficher_pinceau(Pos_X, Fin_Y,Couleur,0); -#ifdef __macosx__ +#if defined(__macosx__) || defined(__FreeBSD__) Mettre_Ecran_A_Jour(Debut_X,Fin_X,Fin_X-Debut_X,Fin_Y-Debut_Y); #endif } diff --git a/init.c b/init.c index 9b7a8996..347b2e1e 100644 --- a/init.c +++ b/init.c @@ -170,7 +170,7 @@ void Rechercher_drives(void) Liste_points_montage->me_mountdir); } next = Liste_points_montage -> me_next; -#ifndef __macosx__ +#if !(defined(__macosx__) || defined(__FreeBSD__)) free(Liste_points_montage -> me_type); #endif free(Liste_points_montage); diff --git a/main.c b/main.c index 74756a2d..a8e4181c 100644 --- a/main.c +++ b/main.c @@ -60,6 +60,8 @@ #elif defined(__macosx__) #import #import +#elif defined(__FreeBSD__) + #import #elif defined(__AROS__) || defined(__BEOS__) || defined(__MORPHOS__) || defined(__GP2X__) #include "realpath.h" #endif diff --git a/mountlist.c b/mountlist.c index 970f0163..a80a1426 100644 --- a/mountlist.c +++ b/mountlist.c @@ -19,7 +19,7 @@ #if(!defined(__WIN32__))&&(!defined(__amigaos4__))&&(!defined(__AROS__))&&(!defined(__MORPHOS__)) // We don't use autoconf and all that in grafx2, so let's do the config here ... -#ifdef __macosx__ // MacOS X is POSIX compliant +#if defined(__macosx__)||defined(__FreeBSD__) // MacOS X is POSIX compliant #define MOUNTED_GETMNTINFO #elif defined(__BEOS__) || defined(__HAIKU__) #define MOUNTED_FS_STAT_DEV @@ -444,7 +444,7 @@ read_file_system_list (bool need_fs_type) #ifdef MOUNTED_GETMNTINFO /* 4.4BSD. */ -#ifdef __macosx__ +#if defined(__macosx__) || defined(__FreeBSD__) { struct statfs *fsp; int entries; diff --git a/pages.c b/pages.c index b1eb3363..fa29ab49 100644 --- a/pages.c +++ b/pages.c @@ -832,7 +832,7 @@ void Backup(void) // Sauve la page courante comme première page de backup et crée une nouvelle page // pur continuer à dessiner. Utilisé par exemple pour le fill { - #ifdef __macosx__ + #if defined(__macosx__) || defined(__FreeBSD__) S_Page Nouvelle_page; #else S_Page *Nouvelle_page; @@ -843,7 +843,7 @@ void Backup(void) Upload_infos_page_principal(Principal_Backups->Pages); // On crée un descripteur pour la nouvelle page courante -#ifdef __macosx__ +#if defined(__macosx__) || defined(__FreeBSD__) Initialiser_S_Page(&Nouvelle_page); // Enrichissement de l'historique @@ -866,7 +866,7 @@ void Backup(void) memcpy(Principal_Ecran,Ecran_backup,Principal_Largeur_image*Principal_Hauteur_image); // On détruit le descripteur de la page courante -#ifndef __macosx__ +#if !(defined(__macosx__) || defined(__FreeBSD__)) free(Nouvelle_page); #endif diff --git a/sdlscreen.c b/sdlscreen.c index c27a8718..ad48dcb0 100644 --- a/sdlscreen.c +++ b/sdlscreen.c @@ -38,7 +38,7 @@ // METHODE_UPDATE peut être fixé depuis le makefile, sinon c'est ici: #ifndef METHODE_UPDATE - #ifdef __macosx__ + #if defined(__macosx__) || defined(__FreeBSD__) #define METHODE_UPDATE METHODE_UPDATE_PLEINE_PAGE #else #define METHODE_UPDATE METHODE_UPDATE_PAR_CUMUL diff --git a/setup.c b/setup.c index 5e1f1d24..33254c9f 100644 --- a/setup.c +++ b/setup.c @@ -33,6 +33,8 @@ #elif defined(__macosx__) #import #import +#elif defined(__FreeBSD__) + #import #endif #include "struct.h"