projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed namespace pollution due to a number of global symbols missing an fg prefix
[freeglut]
/
src
/
x11
/
fg_spaceball_x11.c
diff --git
a/src/x11/fg_spaceball_x11.c
b/src/x11/fg_spaceball_x11.c
index
e8c328a
..
155d24b
100644
(file)
--- a/
src/x11/fg_spaceball_x11.c
+++ b/
src/x11/fg_spaceball_x11.c
@@
-14,7
+14,7
@@
#include <X11/Xlib.h>
#include <X11/Xlib.h>
-extern int sball_initialized;
+extern int fg_sball_initialized;
enum {
SPNAV_EVENT_ANY, /* used by spnav_remove_events() */
enum {
SPNAV_EVENT_ANY, /* used by spnav_remove_events() */
@@
-56,17
+56,17
@@
void fgPlatformInitializeSpaceball(void)
{
Window w;
{
Window w;
- sball_initialized = 1;
+ fg_sball_initialized = 1;
if(!fgStructure.CurrentWindow)
{
if(!fgStructure.CurrentWindow)
{
- sball_initialized = -1;
+ fg_sball_initialized = -1;
return;
}
w = fgStructure.CurrentWindow->Window.Handle;
if(spnav_x11_open(fgDisplay.pDisplay.Display, w) == -1)
{
return;
}
w = fgStructure.CurrentWindow->Window.Handle;
if(spnav_x11_open(fgDisplay.pDisplay.Display, w) == -1)
{
- sball_initialized = -1;
+ fg_sball_initialized = -1;
return;
}
}
return;
}
}
@@
-105,7
+105,7
@@
int fgIsSpaceballXEvent(const XEvent *xev)
fgSpaceballSetWindow(fgStructure.CurrentWindow);
}
fgSpaceballSetWindow(fgStructure.CurrentWindow);
}
- if(sball_initialized != 1) {
+ if(fg_sball_initialized != 1) {
return 0;
}
return 0;
}
@@
-116,9
+116,9
@@
void fgSpaceballHandleXEvent(const XEvent *xev)
{
spnav_event sev;
{
spnav_event sev;
- if(sball_initialized == 0) {
+ if(fg_sball_initialized == 0) {
fgInitialiseSpaceball();
fgInitialiseSpaceball();
- if(sball_initialized != 1) {
+ if(fg_sball_initialized != 1) {
return;
}
}
return;
}
}