Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #562 from CheezeCake/master

Browse Source 
Fixed compile errors on FreeBSD
This commit is contained in:
Jan Haller 2014-04-06 19:26:41 +02:00
commit 83fd76c40b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SFML/Window/FreeBSD/JoystickImpl.cpp
View File

@ -320,7 +320,7 @@ JoystickCaps JoystickImpl::getCapabilities() const
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Identifcation JoystickImpl::getIdentification() const Joystick::Identification JoystickImpl::getIdentification() const
{ {
return m_identification; return m_identification;
} }

4
src/SFML/Window/FreeBSD/JoystickImpl.hpp
View File

@ -97,7 +97,7 @@ public :
/// \return Joystick identification /// \return Joystick identification
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Identification getIdentification() const; Joystick::Identification getIdentification() const;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Update the joystick and get its new state /// \brief Update the joystick and get its new state
@ -119,7 +119,7 @@ private :
void *m_buffer; ///< USB HID buffer void *m_buffer; ///< USB HID buffer
int m_length; ///< Buffer length int m_length; ///< Buffer length
Identification m_identificaion; ///< Joystick identification Joystick::Identification m_identification; ///< Joystick identification
JoystickState m_state; ///< Current state of the joystick JoystickState m_state; ///< Current state of the joystick
}; };