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
/
fg_spaceball.c
diff --git
a/src/fg_spaceball.c
b/src/fg_spaceball.c
index
9534746
..
93727a1
100644
(file)
--- a/
src/fg_spaceball.c
+++ b/
src/fg_spaceball.c
@@
-22,11
+22,11
@@
extern int fgPlatformSpaceballNumButtons(void);
extern void fgPlatformSpaceballSetWindow(SFG_Window *window);
extern void fgPlatformSpaceballSetWindow(SFG_Window *window);
-int sball_initialized = 0;
+int fg_sball_initialized = 0;
void fgInitialiseSpaceball(void)
{
void fgInitialiseSpaceball(void)
{
- if(sball_initialized != 0) {
+ if(fg_sball_initialized != 0) {
return;
}
return;
}
@@
-35,14
+35,14
@@
void fgInitialiseSpaceball(void)
void fgSpaceballClose(void)
{
void fgSpaceballClose(void)
{
- fgPlatformSpaceballClose();
+ fgPlatformSpaceballClose();
}
int fgHasSpaceball(void)
{
}
int fgHasSpaceball(void)
{
- if(sball_initialized == 0) {
+ if(fg_sball_initialized == 0) {
fgInitialiseSpaceball();
fgInitialiseSpaceball();
- if(sball_initialized != 1) {
+ if(fg_sball_initialized != 1) {
fgWarning("fgInitialiseSpaceball failed\n");
return 0;
}
fgWarning("fgInitialiseSpaceball failed\n");
return 0;
}
@@
-53,9
+53,9
@@
int fgHasSpaceball(void)
int fgSpaceballNumButtons(void)
{
int fgSpaceballNumButtons(void)
{
- if(sball_initialized == 0) {
+ if(fg_sball_initialized == 0) {
fgInitialiseSpaceball();
fgInitialiseSpaceball();
- if(sball_initialized != 1) {
+ if(fg_sball_initialized != 1) {
fgWarning("fgInitialiseSpaceball failed\n");
return 0;
}
fgWarning("fgInitialiseSpaceball failed\n");
return 0;
}
@@
-66,9
+66,9
@@
int fgSpaceballNumButtons(void)
void fgSpaceballSetWindow(SFG_Window *window)
{
void fgSpaceballSetWindow(SFG_Window *window)
{
- if(sball_initialized == 0) {
+ if(fg_sball_initialized == 0) {
fgInitialiseSpaceball();
fgInitialiseSpaceball();
- if(sball_initialized != 1) {
+ if(fg_sball_initialized != 1) {
return;
}
}
return;
}
}
@@
-88,12
+88,12
@@
void fgSpaceballClose(void)
int fgHasSpaceball(void)
{
int fgHasSpaceball(void)
{
- return 0;
+ return 0;
}
int fgSpaceballNumButtons(void)
{
}
int fgSpaceballNumButtons(void)
{
- return 0;
+ return 0;
}
void fgSpaceballSetWindow(SFG_Window *window)
}
void fgSpaceballSetWindow(SFG_Window *window)