diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/tinyb_hci/BTDataTypes.hpp (renamed from api/tinyb_hci/DataTypes.hpp) | 8 | ||||
| -rw-r--r-- | api/tinyb_hci/BasicTypes.hpp (renamed from api/tinyb_hci/HCIUtil.hpp) | 9 | ||||
| -rw-r--r-- | api/tinyb_hci/HCITypes.hpp | 5 | ||||
| -rw-r--r-- | api/tinyb_hci/UUID.hpp | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/api/tinyb_hci/DataTypes.hpp b/api/tinyb_hci/BTDataTypes.hpp index d51767e4..f47c6262 100644 --- a/api/tinyb_hci/DataTypes.hpp +++ b/api/tinyb_hci/BTDataTypes.hpp @@ -23,8 +23,8 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef DATATYPES_HPP_ -#define DATATYPES_HPP_ +#ifndef BTDATATYPES_HPP_ +#define BTDATATYPES_HPP_ #pragma once #include <cstring> @@ -33,7 +33,7 @@ #include <cstdint> #include <vector> -#include "HCIUtil.hpp" +#include "BasicTypes.hpp" #include "UUID.hpp" namespace tinyb_hci { @@ -370,4 +370,4 @@ public: } // namespace tinyb_hci -#endif /* DATATYPES_HPP_ */ +#endif /* BTDATATYPES_HPP_ */ diff --git a/api/tinyb_hci/HCIUtil.hpp b/api/tinyb_hci/BasicTypes.hpp index 31a931a7..2436547f 100644 --- a/api/tinyb_hci/HCIUtil.hpp +++ b/api/tinyb_hci/BasicTypes.hpp @@ -23,8 +23,8 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef HCIUTIL_HPP_ -#define HCIUTIL_HPP_ +#ifndef BASICTYPES_HPP_ +#define BASICTYPES_HPP_ #pragma once #include <cstring> @@ -37,9 +37,6 @@ extern "C" { #include <byteswap.h> } -#define JAVA_MAIN_PACKAGE "org/tinyb" -#define JAVA_HCI_PACKAGE "tinyb/hci" - namespace tinyb_hci { /** @@ -314,4 +311,4 @@ namespace tinyb_hci { } // namespace tinyb_hci -#endif /* HCIUTIL_HPP_ */ +#endif /* BASICTYPES_HPP_ */ diff --git a/api/tinyb_hci/HCITypes.hpp b/api/tinyb_hci/HCITypes.hpp index 5bc71d66..f9330986 100644 --- a/api/tinyb_hci/HCITypes.hpp +++ b/api/tinyb_hci/HCITypes.hpp @@ -37,7 +37,10 @@ #include <atomic> #include "UUID.hpp" -#include "DataTypes.hpp" +#include "BTDataTypes.hpp" + +#define JAVA_MAIN_PACKAGE "org/tinyb" +#define JAVA_HCI_PACKAGE "tinyb/hci" namespace tinyb_hci { diff --git a/api/tinyb_hci/UUID.hpp b/api/tinyb_hci/UUID.hpp index d1cb6731..b51c5361 100644 --- a/api/tinyb_hci/UUID.hpp +++ b/api/tinyb_hci/UUID.hpp @@ -33,7 +33,7 @@ #include <cstdint> #include <vector> -#include "HCIUtil.hpp" +#include "BasicTypes.hpp" namespace tinyb_hci { |