[X2Go-Commits] [x2gokdrive] 01/12: x2gokdriveremote.{c|h}: Avoid remote.h as include file. Too commonly used.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 041844c9ca8efe6f9c71e98338b60e32959f98b7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 16 13:43:08 2019 +0200

    x2gokdriveremote.{c|h}: Avoid remote.h as include file. Too commonly used.
---
 Makefile                       | 2 +-
 Makefile.am                    | 4 ++--
 x2gokdrive.h                   | 2 +-
 x2gokdrivecursor.c             | 2 +-
 x2gokdriveinit.c               | 2 +-
 remote.c => x2gokdriveremote.c | 2 +-
 remote.h => x2gokdriveremote.h | 0
 x2gokdriveselection.h          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index ddfa5fe..a39ee84 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ include ../ephyr/Makefile
 VPATH = ../../../../../../hw/kdrive/x2gokdrive
 
 X2GO_OBJECTS = x2gokdriveselection.o x2gokdrive.o \
-	x2gokdriveinit.o x2gokdrivecursor.o remote.o
+	x2gokdriveinit.o x2gokdrivecursor.o x2gokdriveremote.o
 
 x2gokdrive: $(X2GO_OBJECTS) $(Xephyr_DEPENDENCIES) $(EXTRA_Xephyr_DEPENDENCIES)
 	$(AM_V_CCLD)$(Xephyr_LINK) $(X2GO_OBJECTS) $(Xephyr_LDADD) $(LIBS) -lz -ljpeg -lpng -lpthread
diff --git a/Makefile.am b/Makefile.am
index 8468d9c..361e1e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,8 +33,8 @@ AM_CPPFLAGS = 			\
 bin_PROGRAMS = x2gokdrive
 
 x2gokdrive_SOURCES = \
-	remote.c \
-	remote.h \
+	x2gokdriveremote.c \
+	x2gokdriveremote.h \
 	x2gokdrive.c \
 	x2gokdrivecursor.c \
 	x2gokdrive.h \
diff --git a/x2gokdrive.h b/x2gokdrive.h
index 6415de2..b956094 100644
--- a/x2gokdrive.h
+++ b/x2gokdrive.h
@@ -34,7 +34,7 @@
 
 #include "os.h"                 /* for OsSignal() */
 #include "kdrive.h"
-#include "remote.h"
+#include "x2gokdriveremote.h"
 //#include "exa.h"
 
 #ifdef RANDR
diff --git a/x2gokdrivecursor.c b/x2gokdrivecursor.c
index e491f34..dd46f7e 100644
--- a/x2gokdrivecursor.c
+++ b/x2gokdrivecursor.c
@@ -35,7 +35,7 @@
 #endif
 #include "x2gokdrive.h"
 #include "x2gokdrivelog.h"
-#include "remote.h"
+#include "x2gokdriveremote.h"
 #include "cursorstr.h"
 #include <xcb/render.h>
 #include <xcb/xcb_renderutil.h>
diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c
index b7b3767..8951c5f 100644
--- a/x2gokdriveinit.c
+++ b/x2gokdriveinit.c
@@ -37,7 +37,7 @@
 #include "x2gokdrive.h"
 #include "x2gokdrivelog.h"
 #include "glx_extinit.h"
-#include "remote.h"
+#include "x2gokdriveremote.h"
 
 extern Window EphyrPreExistingHostWin;
 extern Bool EphyrWantGrayScale;
diff --git a/remote.c b/x2gokdriveremote.c
similarity index 99%
rename from remote.c
rename to x2gokdriveremote.c
index 9bbd4ac..cdc79ee 100644
--- a/remote.c
+++ b/x2gokdriveremote.c
@@ -34,7 +34,7 @@
 #endif /* XORG_VERSION_CURRENT */
 
 #endif
-#include "remote.h"
+#include "x2gokdriveremote.h"
 
 /*init it in os init*/
 static RemoteHostVars remoteVars;
diff --git a/remote.h b/x2gokdriveremote.h
similarity index 100%
rename from remote.h
rename to x2gokdriveremote.h
diff --git a/x2gokdriveselection.h b/x2gokdriveselection.h
index 7b9b097..4928075 100644
--- a/x2gokdriveselection.h
+++ b/x2gokdriveselection.h
@@ -27,7 +27,7 @@
 
 #ifndef X2GOKDRIVESELECTION
 #define X2GOKDRIVESELECTION
-#include "remote.h"
+#include "x2gokdriveremote.h"
 
 void selection_init( struct RemoteHostVars* obj);
 void install_selection_callbacks(void );

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git