pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Solaris nitpicks (thanks Mattias!)

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40167
This commit is contained in:
Sam Lantinga 2001-09-04 22:48:09 +00:00
parent b29480bdb9
commit ee5429fd3e
4 changed files with 14 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/timer/linux/SDL_systimer.c
View file

@ -46,11 +46,11 @@ static char rcsid =
/* The following defines should really be determined at configure time */
#ifdef linux
#if defined(linux)
/* Linux select() changes its timeout parameter upon return to contain
the remaining time. Most other unixen leave it unchanged or undefined. */
#define SELECT_SETS_REMAINING
#elif defined(__bsdi__) || defined(__FreeBSD__) || defined(__sun__)
#elif defined(__bsdi__) || defined(__FreeBSD__) || defined(__sun)
#define USE_NANOSLEEP
#endif

39
src/video/x11/SDL_x11image.c
View file

@ -26,23 +26,13 @@ static char rcsid =
#endif
#include <stdlib.h>
#include <unistd.h>
#include "SDL_error.h"
#include "SDL_endian.h"
#include "SDL_events_c.h"
#include "SDL_x11image_c.h"
#if defined(__USLC__)
#ifdef HAVE_KSTAT
#undef HAVE_KSTAT
#endif
#include <unistd.h>
#endif
#ifdef HAVE_KSTAT
#include <kstat.h>
#endif
#ifndef NO_SHARED_MEMORY
/* Shared memory information */
@ -177,13 +167,13 @@ void X11_DestroyImage(_THIS, SDL_Surface *screen)
}
}
/* This is a hack to see whether this system has more than 1 CPU */
/* Determine the number of CPUs in the system */
static int num_CPU(void)
{
static int num_cpus = 0;
if(!num_cpus) {
#ifdef linux
#if defined(__linux)
char line[BUFSIZ];
FILE *pstat = fopen("/proc/stat", "r");
if ( pstat ) {
@ -194,23 +184,12 @@ static int num_CPU(void)
}
fclose(pstat);
}
#elif defined(HAVE_KSTAT)
kstat_ctl_t *kc = kstat_open();
kstat_t *ks;
kstat_named_t *kn;
if(kc) {
if((ks = kstat_lookup(kc, "unix", -1, "system_misc"))
&& kstat_read(kc, ks, NULL) != -1
&& (kn = kstat_data_lookup(ks, "ncpus")))
#ifdef KSTAT_DATA_UINT32
num_cpus = kn->value.ui32;
#else
num_cpus = kn->value.ul; /* needed in solaris <2.6 */
#endif
kstat_close(kc);
}
#elif defined(__USLC__)
num_cpus = (int)sysconf(_SC_NPROCESSORS_CONF);
#elif defined(_SC_NPROCESSORS_ONLN)
/* number of processors online (SVR4.0MP compliant machines) */
num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
#elif defined(_SC_NPROCESSORS_CONF)
/* number of processors configured (SVR4.0MP compliant machines) */
num_cpus = sysconf(_SC_NPROCESSORS_CONF);
#endif
if ( num_cpus <= 0 ) {
num_cpus = 1;