From 8a5d7e7eea48fc6ac7140ad313d5215702106a7c Mon Sep 17 00:00:00 2001 From: Luke Ceddia Date: Tue, 16 Jan 2018 20:29:20 +1100 Subject: [PATCH] Remove QB64_X11 --- internal/c/common.h | 4 ---- internal/c/libqb.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/internal/c/common.h b/internal/c/common.h index 4325fcbf9..9d57a868e 100644 --- a/internal/c/common.h +++ b/internal/c/common.h @@ -22,10 +22,6 @@ #define QB64_GL1 #define QB64_GLUT -#ifdef QB64_LINUX - #define QB64_X11 -#endif - #ifdef DEPENDENCY_CONSOLE_ONLY #undef QB64_GLUT #else diff --git a/internal/c/libqb.cpp b/internal/c/libqb.cpp index 1b9444a2f..4b119ceac 100644 --- a/internal/c/libqb.cpp +++ b/internal/c/libqb.cpp @@ -172,7 +172,7 @@ void setbits(uint32 bsize,uint8 *base,ptrszint i,int64 val){ #include //required for dirname() #endif -#ifdef QB64_X11 +#ifdef QB64_LINUX #include #include #include @@ -24227,7 +24227,7 @@ int32 func__exit(){ -#if defined(QB64_LINUX) && defined(QB64_X11) +#if defined(QB64_LINUX) //X11 clipboard interface for Linux //SDL_SysWMinfo syswminfo; @@ -24414,7 +24414,7 @@ if (x11selectionowner!=None){ return; #endif -#if defined(QB64_LINUX) && defined(QB64_X11) +#if defined(QB64_LINUX) static qbs *textz=NULL; if (!textz) textz=qbs_new(0,0); qbs_set(textz,qbs_add(text,qbs_new_txt_len("\0",1))); x11clipboardcopy((char*)textz->chr); @@ -24641,7 +24641,7 @@ return -1; return NULL; #endif -#if defined(QB64_LINUX) && defined(QB64_X11) +#if defined(QB64_LINUX) qbs *text; char *cp=x11clipboardpaste(); cp=x11clipboardpaste();