This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 74cd23b70c16775582040cf7f4b1f7d68e97c028 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 17 00:35:12 2019 +0200 Dissolve circular include dependency, fix RemoteHostVars declaration warnings. --- x2gokdriveremote.c | 5 +++-- x2gokdriveremote.h | 11 ++--------- x2gokdriveselection.c | 4 ++-- x2gokdriveselection.h | 5 +++-- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c index da77595..963dfd9 100644 --- a/x2gokdriveremote.c +++ b/x2gokdriveremote.c @@ -35,9 +35,10 @@ #endif #include "x2gokdriveremote.h" +#include "x2gokdriveselection.h" -/*init it in os init*/ -static RemoteHostVars remoteVars; +/* init it in OsInit() */ +static struct _remoteHostVars remoteVars; static BOOL remoteInitialized=FALSE; diff --git a/x2gokdriveremote.h b/x2gokdriveremote.h index a97d486..221e4ac 100644 --- a/x2gokdriveremote.h +++ b/x2gokdriveremote.h @@ -88,9 +88,6 @@ #include <netdb.h> #include <arpa/inet.h> -#include "x2gokdriveselection.h" - - #define EPHYR_WANT_DEBUG 1 // #warning DEBUG ENABLED @@ -295,7 +292,7 @@ typedef struct }SelectionStructure; -struct RemoteHostVars +struct _remoteHostVars { unsigned char compression; OsTimerPtr checkConnectionTimer; @@ -371,11 +368,7 @@ struct RemoteHostVars BOOL client_initialized; SelectionStructure selstruct; -}; -typedef struct RemoteHostVars RemoteHostVars; - - - +} RemoteHostVars; int send_selection(int sel, char* data, uint32_t length, uint32_t mimeData); diff --git a/x2gokdriveselection.c b/x2gokdriveselection.c index a1dfaa8..33dba70 100644 --- a/x2gokdriveselection.c +++ b/x2gokdriveselection.c @@ -41,7 +41,7 @@ #include "propertyst.h" #include "xace.h" -RemoteHostVars *remoteVars; +static struct _remoteHostVars *remoteVars; static Atom atomPrimary, atomClipboard, atomTargets, atomString, atomUTFString, atomTimestamp; static Atom imageAtom=0; @@ -640,7 +640,7 @@ static int proc_change_property(ClientPtr client) return rc; } -void selection_init(struct RemoteHostVars *obj) +void selection_init(struct _remoteHostVars *obj) { EPHYR_DBG("INITIALIZING selections"); remoteVars=obj; diff --git a/x2gokdriveselection.h b/x2gokdriveselection.h index 829cad2..7ef53e2 100644 --- a/x2gokdriveselection.h +++ b/x2gokdriveselection.h @@ -27,10 +27,11 @@ #ifndef X2GOKDRIVESELECTION_H #define X2GOKDRIVESELECTION_H + #include "x2gokdriveremote.h" -void selection_init( struct RemoteHostVars* obj); -void install_selection_callbacks(void ); +void selection_init(struct _remoteHostVars *obj); +void install_selection_callbacks(void); int own_selection(int target); #endif /* X2GOKDRIVESELECTION_H */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git