diff options
author | Tim Angus <tim@ngus.net> | 2007-07-21 22:52:39 +0000 |
---|---|---|
committer | Tim Angus <tim@ngus.net> | 2007-07-21 22:52:39 +0000 |
commit | bfef94ce3a4f415043c0e7b97e222a3e9ee14b8d (patch) | |
tree | 0169bfb821f1e92d7c5d2d38dff60cd0a5bca714 /src/unix | |
parent | 32685fe5624f4f7a722ebf27388b24711e772ff1 (diff) |
* Merge of ioq3-r1119
Diffstat (limited to 'src/unix')
-rw-r--r-- | src/unix/unix_main.c | 14 | ||||
-rw-r--r-- | src/unix/unix_net.c | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/unix/unix_main.c b/src/unix/unix_main.c index e399140c..86d97a1d 100644 --- a/src/unix/unix_main.c +++ b/src/unix/unix_main.c @@ -73,7 +73,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if idppc_altivec #ifdef MACOS_X - #include <Carbon/Carbon.h> + #include <sys/sysctl.h> #endif #endif @@ -384,11 +384,13 @@ qboolean Sys_DetectAltivec( void ) #if idppc_altivec #ifdef MACOS_X - long feat = 0; - OSErr err = Gestalt(gestaltPowerPCProcessorFeatures, &feat); - if ((err==noErr) && ((1 << gestaltPowerPCHasVectorInstructions) & feat)) { - altivec = qtrue; - } + int selectors[2] = { CTL_HW, HW_VECTORUNIT }; + int hasVectorUnit = 0; + size_t length = sizeof(hasVectorUnit); + int error = sysctl(selectors, 2, &hasVectorUnit, &length, NULL, 0); + + if( 0 == error ) + altivec = (hasVectorUnit != 0); #else void (*handler)(int sig); handler = signal(SIGILL, illegal_instruction); diff --git a/src/unix/unix_net.c b/src/unix/unix_net.c index 31d27c8d..86706673 100644 --- a/src/unix/unix_net.c +++ b/src/unix/unix_net.c @@ -383,8 +383,6 @@ void NET_GetLocalAddress( void ) { int interfaceSocket; int family; - Com_Printf("NET_GetLocalAddress: Querying for network interfaces\n"); - // Set this early so we can just return if there is an error numIP = 0; @@ -406,7 +404,6 @@ void NET_GetLocalAddress( void ) { return; } - linkInterface = (struct ifreq *) ifc.ifc_buf; while ((char *) linkInterface < &ifc.ifc_buf[ifc.ifc_len]) { unsigned int nameLength; @@ -470,7 +467,6 @@ void NET_GetLocalAddress( void ) { } linkInterface = IFR_NEXT(linkInterface); } - Com_Printf("NET_GetLocalAddress: DONE querying for network interfaces\n"); close(interfaceSocket); } |