diff options
| author | Sven Gothel <[email protected]> | 2015-03-06 10:02:03 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-06 10:02:03 +0100 |
| commit | 27ebb38b9ffd3cc8f4ee3b97509b0f32ef2680aa (patch) | |
| tree | 5a50541643e21ae1a3d49d65c405cdefa4b64569 /src/newt | |
| parent | eced1d4e45772a862d649e3cd7b500c6bc1643a1 (diff) | |
Bug 1135 - Cleanup: Fix native code Warning
Diffstat (limited to 'src/newt')
| -rw-r--r-- | src/newt/native/X11Display.c | 2 | ||||
| -rw-r--r-- | src/newt/native/X11RandR13.c | 4 | ||||
| -rw-r--r-- | src/newt/native/X11Window.c | 2 | ||||
| -rw-r--r-- | src/newt/native/bcm_vc_iv.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/newt/native/X11Display.c b/src/newt/native/X11Display.c index b62a9b234..60daf1af2 100644 --- a/src/newt/native/X11Display.c +++ b/src/newt/native/X11Display.c @@ -30,7 +30,7 @@ #include <X11/Xcursor/Xcursor.h> -// #include <X11/XKBlib.h> // XKB disabled for now +#include <X11/XKBlib.h> jclass X11NewtWindowClazz = NULL; jmethodID insetsChangedID = NULL; diff --git a/src/newt/native/X11RandR13.c b/src/newt/native/X11RandR13.c index 5eacbf216..1d721efcb 100644 --- a/src/newt/native/X11RandR13.c +++ b/src/newt/native/X11RandR13.c @@ -26,7 +26,7 @@ * or implied, of JogAmp Community. */ -#include "X11Common.h" +#include "X11Screen.h" /* * Class: jogamp_newt_driver_x11_RandR13 @@ -67,7 +67,7 @@ static void dumpOutputs(const char *prefix, Display *dpy, XRRScreenResources *re for(i=0; i<noutput; i++) { RROutput output = outputs[i]; XRROutputInfo * xrrOutputInfo = XRRGetOutputInfo (dpy, resources, output); - fprintf(stderr, " Output[%d]: id %#lx, crtx 0x%X, name %s (%d), %lux%lu, ncrtc %d, nclone %d, nmode %d (preferred %d)\n", + fprintf(stderr, " Output[%d]: id %#lx, crtx 0x%lX, name %s (%d), %lux%lu, ncrtc %d, nclone %d, nmode %d (preferred %d)\n", i, output, xrrOutputInfo->crtc, SAFE_STRING(xrrOutputInfo->name), xrrOutputInfo->nameLen, xrrOutputInfo->mm_width, xrrOutputInfo->mm_height, xrrOutputInfo->ncrtc, xrrOutputInfo->nclone, xrrOutputInfo->nmode, xrrOutputInfo->npreferred); diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c index 2cc66c78d..43506c6a6 100644 --- a/src/newt/native/X11Window.c +++ b/src/newt/native/X11Window.c @@ -489,7 +489,7 @@ static Bool WaitForUnmapNotify( Display *dpy, XEvent *event, XPointer arg ) { } static void NewtWindows_setPosSize(Display *dpy, Window w, jint x, jint y, jint width, jint height) { - if(width>0 && height>0 || x>=0 && y>=0) { // resize/position if requested + if( ( width>0 && height>0 ) || ( x>=0 && y>=0 ) ) { // resize/position if requested XWindowChanges xwc; int flags = CWX | CWY; diff --git a/src/newt/native/bcm_vc_iv.c b/src/newt/native/bcm_vc_iv.c index ee59f0aa6..6b1ee3aaf 100644 --- a/src/newt/native/bcm_vc_iv.c +++ b/src/newt/native/bcm_vc_iv.c @@ -357,7 +357,7 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_bcm_vc_iv_WindowDriver_CreateWin VC_RECT_T src_rect; if( 0 == display ) { - return; + return 0; } dst_rect.x = x; dst_rect.y = y; |