[xboxdrv] 36/78: Fixed clang++ complaining about unnamed structs aren't allow in anonymous unions
Andrey Rahmatullin
wrar-guest at moszumanska.debian.org
Sun Feb 21 17:55:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
wrar-guest pushed a commit to branch master
in repository xboxdrv.
commit 375caacbc2028efe633b37723af8490270d641c8
Author: Ingo Ruhnke <grumbel at gmail.com>
Date: Sat Jun 20 13:50:44 2015 +0200
Fixed clang++ complaining about unnamed structs aren't allow in anonymous unions
---
src/buttonevent/macro_button_event_handler.hpp | 36 ++++++++++++++------------
src/chatpad.hpp | 31 ++++++++++++----------
2 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/src/buttonevent/macro_button_event_handler.hpp b/src/buttonevent/macro_button_event_handler.hpp
index 2b12ba5..7c13913 100644
--- a/src/buttonevent/macro_button_event_handler.hpp
+++ b/src/buttonevent/macro_button_event_handler.hpp
@@ -25,26 +25,30 @@ class MacroButtonEventHandler : public ButtonEventHandler
{
public:
private:
+ struct AbsInfo {
+ UIEvent event;
+ int minimum;
+ int maximum;
+ int fuzz;
+ int flat;
+ };
+
+ struct Event {
+ UIEvent event;
+ int value;
+ };
+
+ struct Time {
+ int msec;
+ };
+
struct MacroEvent {
enum { kInitOp, kSendOp, kWaitOp, kNull } type;
union {
- struct {
- UIEvent event;
- int minimum;
- int maximum;
- int fuzz;
- int flat;
- } init;
-
- struct {
- UIEvent event;
- int value;
- } send;
-
- struct {
- int msec;
- } wait;
+ AbsInfo init;
+ Event send;
+ Time wait;
};
};
diff --git a/src/chatpad.hpp b/src/chatpad.hpp
index 75aa604..6182cb1 100644
--- a/src/chatpad.hpp
+++ b/src/chatpad.hpp
@@ -116,21 +116,24 @@ private:
{
uint8_t type;
+ struct ClockData {
+ uint8_t unknown1;
+ uint8_t unknown2;
+ uint8_t count1;
+ uint8_t count2;
+ } __attribute__((__packed__));
+
+ struct KeyData {
+ uint8_t zero1;
+ uint8_t modifier;
+ uint8_t scancode1;
+ uint8_t scancode2;
+ uint8_t zero3;
+ } __attribute__((__packed__));
+
union {
- struct {
- uint8_t unknown1;
- uint8_t unknown2;
- uint8_t count1;
- uint8_t count2;
- } __attribute__((__packed__)) clock;
-
- struct {
- uint8_t zero1;
- uint8_t modifier;
- uint8_t scancode1;
- uint8_t scancode2;
- uint8_t zero3;
- } __attribute__((__packed__)) key;
+ ClockData clock;
+ KeyData key;
};
} __attribute__((__packed__));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/xboxdrv.git
More information about the Pkg-games-commits
mailing list