A couple of changes to let it build again for OS4.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@445 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Pete Gordon 2008-12-31 10:16:08 +00:00
parent d6ef5ddd95
commit 761f872ee2
2 changed files with 7 additions and 3 deletions

View File

@ -915,7 +915,7 @@ void Zoomer_une_ligne(byte* Ligne_originale, byte* Ligne_zoomee,
#include <sys/sysctl.h>
#elif defined(__BEOS__) || defined(__HAIKU__)
// sysinfo not implemented
#elif defined(__AROS__)
#elif defined(__AROS__) || defined(__amigaos4__)
#include <proto/exec.h>
#elif defined(__SKYOS__)
#include <skyos/sysinfo.h>
@ -952,8 +952,9 @@ unsigned long Memoire_libre(void)
len = sizeof(maxmem);
sysctl(mib,2,&maxmem,&len,NULL,0);
return maxmem;
#elif defined(__BEOS__) || defined(__HAIKU__) || defined(__SKYOS__)
#elif defined(__BEOS__) || defined(__HAIKU__) || defined(__SKYOS__) || defined(__amigaos4__)
// No <sys/sysctl.h> on BeOS or Haiku
// AvailMem is misleading on os4 (os4 caches stuff in memory that you can still allocate)
return 10*1024*1024;
#elif defined(__AROS__)
return AvailMem(MEMF_ANY);

View File

@ -285,8 +285,11 @@ void bstrtostr( BSTR in, STRPTR out, TEXT max )
// -- Lecture d'une liste de lecteurs / volumes -----------------------------
void Lire_liste_des_lecteurs(void)
{
// Fixes a warning on os4
#ifndef __amigaos4__
int Indice;
#endif
// Empty the current content of fileselector:
Detruire_liste_du_fileselect();
// Reset number of items