diff options
| author | Ben Millwood <thebenmachine@gmail.com> | 2009-10-03 11:19:42 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:14:53 +0000 |
| commit | 616b5ea15bf22be383df083523174fbefec1cd97 (patch) | |
| tree | 9e92b543f0c46e1224ffcf39ec6699046bfce32b /src | |
| parent | 301fd365934eebeb9322de4191ff77fb1d274cd1 (diff) | |
Fix compiling on OSX
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/bg_local.h | 2 | ||||
| -rw-r--r-- | src/game/bg_pmove.c | 2 | ||||
| -rw-r--r-- | src/qcommon/net_ip.c | 2 | ||||
| -rw-r--r-- | src/sdl/sdl_input.c | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/game/bg_local.h b/src/game/bg_local.h index 354214c9..4c582266 100644 --- a/src/game/bg_local.h +++ b/src/game/bg_local.h @@ -86,3 +86,5 @@ qboolean PM_SlideMove( qboolean gravity ); void PM_StepEvent( vec3_t from, vec3_t to, vec3_t normal ); qboolean PM_StepSlideMove( qboolean gravity, qboolean predictive ); qboolean PM_PredictStepMove( void ); + +void PM_StartTorsoAnim( int anim ); diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c index 76ad71f3..78d22689 100644 --- a/src/game/bg_pmove.c +++ b/src/game/bg_pmove.c @@ -92,7 +92,7 @@ void PM_AddTouchEnt( int entityNum ) PM_StartTorsoAnim =================== */ -static void PM_StartTorsoAnim( int anim ) +void PM_StartTorsoAnim( int anim ) { if( pm->ps->pm_type >= PM_DEAD ) return; diff --git a/src/qcommon/net_ip.c b/src/qcommon/net_ip.c index abff7313..f44ff657 100644 --- a/src/qcommon/net_ip.c +++ b/src/qcommon/net_ip.c @@ -756,7 +756,7 @@ void NET_GetLocalAddress( void ) { if (sdl->sdl_type != IFT_LOOP) { // Get the local interface address strncpy(ifr.ifr_name, inetInterface->ifr_name, sizeof(ifr.ifr_name)); - if (ioctl(interfaceSocket, OSIOCGIFADDR, (caddr_t)&ifr) < 0) { + if (ioctl(interfaceSocket, SIOCGIFADDR, (caddr_t)&ifr) < 0) { Com_Printf("NET_GetLocalAddress: Unable to get local address " "for interface '%s', errno = %d\n", inetInterface->ifr_name, errno); } else { diff --git a/src/sdl/sdl_input.c b/src/sdl/sdl_input.c index d65c3504..ddff11b4 100644 --- a/src/sdl/sdl_input.c +++ b/src/sdl/sdl_input.c @@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifdef MACOS_X_ACCELERATION_HACK #include <IOKit/hidsystem/IOHIDLib.h> #include <IOKit/hidsystem/IOHIDParameter.h> -#include <drivers/event_status_driver.h> +#include <IOKit/hidsystem/event_status_driver.h> #endif //#define KBD_DBG |