diff options
| -rw-r--r-- | hw/kdrive/ephyr/ephyrdriext.c | 2 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/ephyrlog.h | 4 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/hostx.c | 20 |
3 files changed, 13 insertions, 13 deletions
diff --git a/hw/kdrive/ephyr/ephyrdriext.c b/hw/kdrive/ephyr/ephyrdriext.c index b6be47f5e..1b9dce5c8 100644 --- a/hw/kdrive/ephyr/ephyrdriext.c +++ b/hw/kdrive/ephyr/ephyrdriext.c @@ -206,7 +206,7 @@ ephyrDRIScreenInit (ScreenPtr a_screen) a_screen->ClipNotify = ephyrDRIClipNotify ; is_ok = TRUE ; -out: + return is_ok ; } diff --git a/hw/kdrive/ephyr/ephyrlog.h b/hw/kdrive/ephyr/ephyrlog.h index 4c6435edd..71f797777 100644 --- a/hw/kdrive/ephyr/ephyrlog.h +++ b/hw/kdrive/ephyr/ephyrlog.h @@ -33,8 +33,8 @@ #ifdef NDEBUG /*we are not in debug mode*/ -#define EPHYR_LOG -#define EPHYR_LOG_ERROR +#define EPHYR_LOG(...) +#define EPHYR_LOG_ERROR(...) #endif /*NDEBUG*/ #define ERROR_LOG_LEVEL 3 diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index b5ffdd075..a5413b876 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -1078,16 +1078,6 @@ out: } -typedef struct { - int is_valid ; - int local_id ; - int remote_id ; -} ResourcePair ; - -#define RESOURCE_PEERS_SIZE 1024*10 -static ResourcePair resource_peers[RESOURCE_PEERS_SIZE] ; - - int hostx_create_window (int a_screen_number, EphyrBox *a_geometry, @@ -1259,6 +1249,16 @@ hostx_has_xshape (void) } #ifdef XEPHYR_DRI +typedef struct { + int is_valid ; + int local_id ; + int remote_id ; +} ResourcePair ; + +#define RESOURCE_PEERS_SIZE 1024*10 +static ResourcePair resource_peers[RESOURCE_PEERS_SIZE] ; + + int hostx_allocate_resource_id_peer (int a_local_resource_id, int *a_remote_resource_id) |