Changeset 49574 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 20, 2013 10:10:26 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90770

Message:

FE/Qt: fix UISession compilation with VBOX_GUI_WITH_KEYS_RESET_HANDLER

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -77 +77 @@
 #include "CSnapshot.h"
 #include "CMedium.h"
+
+#ifdef VBOX_GUI_WITH_KEYS_RESET_HANDLER
+static void signalHandlerSIGUSR1(int sig, siginfo_t *, void *);
+#endif
 
 #ifdef Q_WS_MAC
@@ -1679 +1683 @@
  */
 /* static */
-void UISession::signalHandlerSIGUSR1(int sig, siginfo_t * /* pInfo */, void * /*pSecret */)
+static void signalHandlerSIGUSR1(int sig, siginfo_t * /* pInfo */, void * /*pSecret */)
 {
     /* only SIGUSR1 is interesting */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -33 +33 @@
 class QMenu;
 class QMenuBar;
-#ifdef VBOX_GUI_WITH_KEYS_RESET_HANDLER
-# ifdef Q_WS_MAC
-struct __siginfo;
-typedef struct __siginfo siginfo_t;
-# else /* Q_WS_MAC */
-struct siginfo;
-typedef struct siginfo siginfo_t;
-# endif /* !Q_WS_MAC */
-#endif /* VBOX_GUI_WITH_KEYS_RESET_HANDLER */
 class UIFrameBuffer;
 class UIMachine;
@@ -305 +296 @@
 #endif /* Q_WS_MAC */
 
-#ifdef VBOX_GUI_WITH_KEYS_RESET_HANDLER
-    static void signalHandlerSIGUSR1(int sig, siginfo_t *pInfo, void *pSecret);
-#endif /* VBOX_GUI_WITH_KEYS_RESET_HANDLER */
-
     /* Private variables: */
     UIMachine *m_pMachine;