upstream fix for vnc compilation issue

diff --git a/VirtualBox-vnc.patch b/VirtualBox-vnc.patch
index 313a6e55a6a00c12513638a5e6cb18e0700e3894..fe98de0e94250838a22737621c4a878d51a23cba 100644 (file)
--- a/VirtualBox-vnc.patch
+++ b/VirtualBox-vnc.patch
@@ -1,82 +1,23 @@
-reverted:
---- include/iprt/cdefs.h       (revision 57336)
-+++ include/iprt/cdefs.h       (revision 57335)
-@@ -949,16 +949,13 @@
- 
- /** @def RTCALL
-  * The standard calling convention for the Runtime interfaces.
-- *
-- * @remarks The regparm(0) in the X86/GNUC variant deals with -mregparm=x use in
-- *          the linux kernel and potentially elsewhere (3rd party).
-  */
- #ifdef _MSC_VER
-+# define RTCALL     __cdecl
--# define RTCALL                 __cdecl
- #elif defined(RT_OS_OS2)
-+# define RTCALL     __cdecl
-+#elif defined(__GNUC__) && defined(IN_RING0) && defined(RT_ARCH_X86) /** @todo consider dropping IN_RING0 here. */
-+# define RTCALL     __attribute__((cdecl,regparm(0))) /* regparm(0) deals with -mregparm=x use in the linux kernel. */
--# define RTCALL                 __cdecl
--#elif defined(__GNUC__) && defined(RT_ARCH_X86)
--# define RTCALL                 __attribute__((cdecl,regparm(0)))
- #else
- # define RTCALL
- #endif
-@@ -1026,9 +1023,21 @@
-  * @param   type    The return type of the function declaration.
-  */
- #ifdef __cplusplus
-+# if defined(_MSC_VER) || defined(RT_OS_OS2)
-+#  define DECLASM(type)          extern "C" type __cdecl
-+# elif defined(__GNUC__) && defined(RT_ARCH_X86)
-+#  define DECLASM(type)          extern "C" type __attribute__((cdecl,regparm(0)))
-+# else
-+#  define DECLASM(type)          extern "C" type
-+# endif
--# define DECLASM(type)           extern "C" type RTCALL
- #else
-+# if defined(_MSC_VER) || defined(RT_OS_OS2)
-+#  define DECLASM(type)          type __cdecl
-+# elif defined(__GNUC__) && defined(RT_ARCH_X86)
-+#  define DECLASM(type)          type __attribute__((cdecl,regparm(0)))
-+# else
-+#  define DECLASM(type)          type
-+# endif
--# define DECLASM(type)           type RTCALL
- #endif
- 
- /** @def DECLASMTYPE
-@@ -1035,7 +1044,11 @@
-  * How to declare an internal assembly function type.
-  * @param   type    The return type of the function.
-  */
-+# if defined(_MSC_VER) || defined(RT_OS_OS2)
-+# define DECLASMTYPE(type)      type __cdecl
-+#else
-+# define DECLASMTYPE(type)      type
-+#endif
--#define DECLASMTYPE(type)       type RTCALL
- 
- /** @def DECLNORETURN
-  * How to declare a function which does not return.
-reverted:
---- src/VBox/VMM/VMMR3/PGMDbg.cpp      (revision 57336)
-+++ src/VBox/VMM/VMMR3/PGMDbg.cpp      (revision 57335)
-@@ -103,8 +103,15 @@
-  * @param   cbNeedle        Size of what we're searching for.
-  */
- 
-+#if defined(_MSC_VER) || defined(RT_OS_OS2)
-+# define DECLASMCALLBACK(type)          type __cdecl
-+#elif defined(__GNUC__) && defined(RT_ARCH_X86)
-+# define DECLASMCALLBACK(type)          type __attribute__((cdecl,regparm(0)))
-+#else
-+# define DECLASMCALLBACK(type)          type
-+#endif
-+typedef DECLASMCALLBACK(uint8_t const *) FNPGMR3DBGFIXEDMEMSCAN(void const *pvHaystack, uint32_t cbHaystack,
-+                                                                void const *pvNeedle, size_t cbNeedle);
--typedef DECLCALLBACK(uint8_t const *) FNPGMR3DBGFIXEDMEMSCAN(void const *pvHaystack, uint32_t cbHaystack,
--                                                             void const *pvNeedle, size_t cbNeedle);
- /** Pointer to an fixed size and step assembly scanner function. */
- typedef FNPGMR3DBGFIXEDMEMSCAN *PFNPGMR3DBGFIXEDMEMSCAN;
+------------------------------------------------------------------------
+r57658 | vboxsync | 2015-09-09 12:54:30 +0200 (śro, 09 wrz 2015) | 2 lines
+
+VNC: build fix
+
+
+Index: src/VBox/ExtPacks/VNC/VBoxVNC.cpp
+===================================================================
+--- src/VBox/ExtPacks/VNC/VBoxVNC.cpp  (revision 57657)
++++ src/VBox/ExtPacks/VNC/VBoxVNC.cpp  (revision 57658)
+@@ -103,8 +103,8 @@
+     unsigned char *mScreenBuffer;
+     unsigned char *mFrameBuffer;
+     uint32_t uClients;
+-    static DECLCALLBACK(enum rfbNewClientAction) rfbNewClientEvent(rfbClientPtr cl);
+-    static DECLCALLBACK(void) vncMouseEvent(int buttonMask, int x, int y, rfbClientPtr cl);
++    static enum rfbNewClientAction rfbNewClientEvent(rfbClientPtr cl);
++    static void vncMouseEvent(int buttonMask, int x, int y, rfbClientPtr cl);
+     static void vncKeyboardEvent(rfbBool down, rfbKeySym keySym, rfbClientPtr cl);
+     static void clientGoneHook(rfbClientPtr cl);
  
+
+------------------------------------------------------------------------