projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A couple of fixes in fg_joystick_x11.c identified in bug report #249
[freeglut]
/
src
/
x11
/
fg_input_devices_x11.c
diff --git
a/src/x11/fg_input_devices_x11.c
b/src/x11/fg_input_devices_x11.c
index
a25de69
..
e5bd55a
100644
(file)
--- a/
src/x11/fg_input_devices_x11.c
+++ b/
src/x11/fg_input_devices_x11.c
@@
-48,7
+48,7
@@
struct _serialport {
typedef struct _serialport SERIALPORT;
typedef struct _serialport SERIALPORT;
-void serial_flush ( SERIALPORT *port );
+void fg_serial_flush ( SERIALPORT *port );
/*****************************************************************/
/*****************************************************************/
@@
-59,7
+59,7
@@
void fgPlatformRegisterDialDevice ( const char *dial_device )
{
}
{
}
-SERIALPORT *serial_open ( const char *device )
+SERIALPORT *fg_serial_open ( const char *device )
{
int fd;
struct termios termio;
{
int fd;
struct termios termio;
@@
-88,11
+88,11
@@
SERIALPORT *serial_open ( const char *device )
cfsetospeed(&termio, B9600);
tcsetattr(fd,TCSANOW,&termio);
cfsetospeed(&termio, B9600);
tcsetattr(fd,TCSANOW,&termio);
- serial_flush(port);
+ fg_serial_flush(port);
return port;
}
return port;
}
-void serial_close(SERIALPORT *port)
+void fg_serial_close(SERIALPORT *port)
{
if (port)
{
{
if (port)
{
@@
-103,7
+103,7
@@
void serial_close(SERIALPORT *port)
}
}
}
}
-int serial_getchar(SERIALPORT *port)
+int fg_serial_getchar(SERIALPORT *port)
{
unsigned char ch;
if (!port) return EOF;
{
unsigned char ch;
if (!port) return EOF;
@@
-111,13
+111,13
@@
int serial_getchar(SERIALPORT *port)
return EOF;
}
return EOF;
}
-int serial_putchar(SERIALPORT *port, unsigned char ch)
+int fg_serial_putchar(SERIALPORT *port, unsigned char ch)
{
if (!port) return 0;
return write(port->fd,&ch,1);
}
{
if (!port) return 0;
return write(port->fd,&ch,1);
}
-void serial_flush ( SERIALPORT *port )
+void fg_serial_flush ( SERIALPORT *port )
{
tcflush ( port->fd, TCIOFLUSH );
}
{
tcflush ( port->fd, TCIOFLUSH );
}