diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-07-11 16:37:42 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-07-11 16:37:42 +0200 |
| commit | 84bf097fb76304eb27d625e5f221dfb5ce922b1f (patch) | |
| tree | 57079ff88525dade11b2d1901357e221df6ddab7 /Source/Core/InputCommon/ControllerInterface | |
| parent | 326af097d9708ea49d54996aec46a7fa328cec1e (diff) | |
| parent | 7e79806efcd5c5e41efea89fa385b480ac1882f5 (diff) | |
Merge pull request #579 from degasus/statics
Mark unexported global variables and functions as statics.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp index c41e82b699..2261a5df98 100644 --- a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp @@ -535,7 +535,7 @@ Expression::~Expression() delete node; } -ExpressionParseStatus ParseExpressionInner(std::string str, ControlFinder &finder, Expression **expr_out) +static ExpressionParseStatus ParseExpressionInner(std::string str, ControlFinder &finder, Expression **expr_out) { ExpressionParseStatus status; Expression *expr; diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp index 4b738d4dbf..c43cd255e8 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp @@ -18,7 +18,7 @@ namespace ciface namespace SDL { -std::string GetJoystickName(int index) +static std::string GetJoystickName(int index) { #if SDL_VERSION_ATLEAST(2, 0, 0) return SDL_JoystickNameForIndex(index); |