diff --git a/examples/pxScene2d/external/westeros-stub/westeros-compositor.h b/examples/pxScene2d/external/westeros-stub/westeros-compositor.h index d7b524f281..b6acd4930e 100644 --- a/examples/pxScene2d/external/westeros-stub/westeros-compositor.h +++ b/examples/pxScene2d/external/westeros-stub/westeros-compositor.h @@ -5,7 +5,6 @@ typedef unsigned int uint32_t; typedef int wl_fixed_t; -typedef unsigned long long int uint64_t; typedef struct _WstRect { @@ -60,7 +59,7 @@ typedef enum _WstHints typedef void (*WstTerminatedCallback)( WstCompositor *ctx, void *userData ); typedef void (*WstDispatchCallback)( WstCompositor *ctx, void *userData ); typedef void (*WstInvalidateSceneCallback)( WstCompositor *ctx, void *userData ); -typedef void (*WstDecodeHandlerCallback)( WstCompositor *ctx, void *userData, uint64_t decoderHandle); +typedef void (*WstDecodeHandlerCallback)( WstCompositor *ctx, void *userData, uint32_t decoderHandle); typedef void (*WstHidePointerCallback)( WstCompositor *ctx, bool hidePointer, void *userData ); typedef void (*WstClientStatus)( WstCompositor *ctx, int status, int clientPID, int detail, void *userData ); diff --git a/examples/pxScene2d/src/pxWayland.cpp b/examples/pxScene2d/src/pxWayland.cpp index 97c2f896ed..54c2ca5d3d 100644 --- a/examples/pxScene2d/src/pxWayland.cpp +++ b/examples/pxScene2d/src/pxWayland.cpp @@ -615,11 +615,11 @@ void pxWayland::invalidate( WstCompositor *wctx, void *userData ) pxw->handleInvalidate(); } -void pxWayland::decoderHandleCallback( WstCompositor *wctx, void *userData, uint64_t decodeHandle) +void pxWayland::decoderHandleCallback( WstCompositor *wctx, void *userData, void* decodeHandle) { (void)wctx; pxWayland *pxw= (pxWayland*)userData; - pxw->setDecoderHandle((void*)decodeHandle); + pxw->setDecoderHandle(decodeHandle); } void pxWayland::hidePointer( WstCompositor *wctx, bool hide, void *userData ) diff --git a/examples/pxScene2d/src/pxWayland.h b/examples/pxScene2d/src/pxWayland.h index a216d519fd..ff7a1ba15b 100644 --- a/examples/pxScene2d/src/pxWayland.h +++ b/examples/pxScene2d/src/pxWayland.h @@ -176,7 +176,7 @@ class pxWayland: public pxIView { pxMatrix4f mLastMatrix; static void invalidate( WstCompositor *wctx, void *userData ); - static void decoderHandleCallback( WstCompositor *wctx, void *userData, uint64_t decoderHandle); + static void decoderHandleCallback( WstCompositor *wctx, void *userData,void* decoderHandle); static void hidePointer( WstCompositor *wctx, bool hide, void *userData ); static void clientStatus( WstCompositor *wctx, int status, int pid, int detail, void *userData ); static void remoteDisconnectedCB(void *data);