removed all HAVE_ERRNO checks
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1724 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
1186d43a25
commit
83552a5fdc
@ -147,14 +147,12 @@ static int fghJoystickFindUSBdev(char *name, char *out, int outlen)
|
||||
if (cp)
|
||||
return 1;
|
||||
}
|
||||
#ifdef HAVE_ERRNO_H
|
||||
else if (errno == EACCES) {
|
||||
if (!protection_warned) {
|
||||
fgWarning ( "Can't open %s for read!", buf );
|
||||
protection_warned = 1;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -172,11 +170,7 @@ static int fghJoystickInitializeHID(struct os_specific_s *os,
|
||||
|
||||
if ( ( rd = hid_get_report_desc( os->fd ) ) == 0 )
|
||||
{
|
||||
#ifdef HAVE_ERRNO_H
|
||||
fgWarning ( "error: %s: %s", os->fname, strerror( errno ) );
|
||||
#else
|
||||
fgWarning ( "error: %s", os->fname );
|
||||
#endif
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -186,11 +180,7 @@ static int fghJoystickInitializeHID(struct os_specific_s *os,
|
||||
if( ioctl( os->fd, USB_GET_REPORT_ID, &report_id ) < 0)
|
||||
{
|
||||
/*** XXX {report_id} may not be the right variable? ***/
|
||||
#ifdef HAVE_ERRNO_H
|
||||
fgWarning ( "error: %s%d: %s", UHIDDEV, report_id, strerror( errno ) );
|
||||
#else
|
||||
fgWarning ( "error: %s%d", UHIDDEV, report_id );
|
||||
#endif
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
@ -27,9 +27,7 @@
|
||||
|
||||
#include <GL/freeglut.h>
|
||||
#include "fg_internal.h"
|
||||
#ifdef HAVE_ERRNO_H
|
||||
#include <errno.h>
|
||||
#endif
|
||||
#include <stdarg.h>
|
||||
|
||||
/*
|
||||
|
@ -33,9 +33,7 @@
|
||||
#include <GL/freeglut.h>
|
||||
#include "../fg_internal.h"
|
||||
|
||||
#ifdef HAVE_ERRNO_H
|
||||
#include <errno.h>
|
||||
#endif
|
||||
#include <sys/ioctl.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
@ -131,10 +131,10 @@ struct tagSFG_PlatformWindowState
|
||||
# ifdef HAVE_FCNTL_H
|
||||
# include <fcntl.h>
|
||||
# endif
|
||||
# ifdef HAVE_ERRNO_H
|
||||
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
# endif
|
||||
|
||||
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
|
||||
/* XXX The below hack is done until freeglut's autoconf is updated. */
|
||||
# define HAVE_USB_JS 1
|
||||
|
@ -115,11 +115,7 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
|
||||
}
|
||||
}
|
||||
}
|
||||
# ifdef HAVE_ERRNO_H
|
||||
if ( len < 0 && errno != EAGAIN )
|
||||
# else
|
||||
if ( len < 0 )
|
||||
# endif
|
||||
{
|
||||
perror( joy->pJoystick.os->fname );
|
||||
joy->error = 1;
|
||||
@ -138,7 +134,6 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
|
||||
|
||||
if ( status != sizeof( struct js_event ) )
|
||||
{
|
||||
# ifdef HAVE_ERRNO_H
|
||||
if ( errno == EAGAIN )
|
||||
{
|
||||
/* Use the old values */
|
||||
@ -149,7 +144,6 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
|
||||
sizeof( float ) * joy->num_axes );
|
||||
return;
|
||||
}
|
||||
# endif
|
||||
|
||||
fgWarning ( "%s", joy->pJoystick.fname );
|
||||
joy->error = GL_TRUE;
|
||||
@ -241,10 +235,8 @@ void fgPlatformJoystickOpen( SFG_Joystick* joy )
|
||||
|
||||
joy->pJoystick.os->fd = open( joy->pJoystick.os->fname, O_RDONLY | O_NONBLOCK);
|
||||
|
||||
#ifdef HAVE_ERRNO_H
|
||||
if( joy->pJoystick.os->fd < 0 && errno == EACCES )
|
||||
fgWarning ( "%s exists but is not readable by you", joy->pJoystick.os->fname );
|
||||
#endif
|
||||
|
||||
joy->error =( joy->pJoystick.os->fd < 0 );
|
||||
|
||||
|
@ -28,9 +28,7 @@
|
||||
|
||||
#include <GL/freeglut.h>
|
||||
#include "../fg_internal.h"
|
||||
#ifdef HAVE_ERRNO_H
|
||||
#include <errno.h>
|
||||
#endif
|
||||
#include <stdarg.h>
|
||||
|
||||
|
||||
@ -118,10 +116,8 @@ void fgPlatformSleepForEvents( fg_time_t msec )
|
||||
wait.tv_usec = (msec % 1000) * 1000;
|
||||
err = select( socket+1, &fdset, NULL, NULL, &wait );
|
||||
|
||||
#ifdef HAVE_ERRNO_H
|
||||
if( ( -1 == err ) && ( errno != EINTR ) )
|
||||
fgWarning ( "freeglut select() error: %d", errno );
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -174,10 +174,7 @@ OF SUCH DAMAGE.
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef HAVE_ERRNO_H
|
||||
#include <errno.h>
|
||||
#endif
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
|
Reference in New Issue
Block a user