From 2fb2a3eb29d51c30970d628c563f69a8b4ef3262 Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Wed, 14 Jul 2021 14:13:54 +0100 Subject: [PATCH] Rename Input.h to vncInput.h to fix building on case-insensitive FS I am cross-compiling from macOS for a FreeBSD-derived system so my host file system is case insensitive but the target isn't. Without this change I get the following warnings which show that the vnc "Input.h" is being included from mi/mi.h instead of the xserver "input.h": ``` In file included from /Users/alex/cheri/xvnc-server/hw/vnc/Input.c:33: /Users/alex/cheri/xvnc-server/mi/mi.h:55:10: warning: non-portable path to file '"Input.h"'; specified path differs in case from file name on disk [-Wnonportable-include-path] #include "input.h" ^~~~~~~~~ "Input.h" ``` --- unix/xserver/hw/vnc/Makefile.am | 4 ++-- unix/xserver/hw/vnc/XserverDesktop.cc | 2 +- unix/xserver/hw/vnc/XserverDesktop.h | 2 +- unix/xserver/hw/vnc/{Input.c => vncInput.c} | 2 +- unix/xserver/hw/vnc/{Input.h => vncInput.h} | 5 ++--- unix/xserver/hw/vnc/{InputXKB.c => vncInputXKB.c} | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) rename unix/xserver/hw/vnc/{Input.c => vncInput.c} (99%) rename unix/xserver/hw/vnc/{Input.h => vncInput.h} (94%) rename unix/xserver/hw/vnc/{InputXKB.c => vncInputXKB.c} (99%) diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am index d2d0265b..f3abd8a0 100644 --- a/unix/xserver/hw/vnc/Makefile.am +++ b/unix/xserver/hw/vnc/Makefile.am @@ -13,12 +13,12 @@ noinst_LTLIBRARIES = libvnccommon.la HDRS = vncExtInit.h vncHooks.h \ vncBlockHandler.h vncSelection.h \ XorgGlue.h XserverDesktop.h xorg-version.h \ - Input.h RFBGlue.h + vncInput.h RFBGlue.h libvnccommon_la_SOURCES = $(HDRS) \ vncExt.c vncExtInit.cc vncHooks.c vncSelection.c \ vncBlockHandler.c XorgGlue.c RandrGlue.c RFBGlue.cc XserverDesktop.cc \ - Input.c InputXKB.c qnum_to_xorgevdev.c qnum_to_xorgkbd.c + vncInput.c vncInputXKB.c qnum_to_xorgevdev.c qnum_to_xorgkbd.c libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" -I$(TIGERVNC_SRCDIR)/unix/common \ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \ diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc index 25dcd845..d9f47f20 100644 --- a/unix/xserver/hw/vnc/XserverDesktop.cc +++ b/unix/xserver/hw/vnc/XserverDesktop.cc @@ -46,7 +46,7 @@ #include "vncHooks.h" #include "vncSelection.h" #include "XorgGlue.h" -#include "Input.h" +#include "vncInput.h" extern "C" { void vncSetGlueContext(int screenIndex); diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h index 383e0bbf..57ee8083 100644 --- a/unix/xserver/hw/vnc/XserverDesktop.h +++ b/unix/xserver/hw/vnc/XserverDesktop.h @@ -36,7 +36,7 @@ #include #include #include -#include "Input.h" +#include "vncInput.h" namespace rfb { class VNCServerST; diff --git a/unix/xserver/hw/vnc/Input.c b/unix/xserver/hw/vnc/vncInput.c similarity index 99% rename from unix/xserver/hw/vnc/Input.c rename to unix/xserver/hw/vnc/vncInput.c index 2a154ada..16ac25ed 100644 --- a/unix/xserver/hw/vnc/Input.c +++ b/unix/xserver/hw/vnc/vncInput.c @@ -24,7 +24,7 @@ #include "xorg-version.h" -#include "Input.h" +#include "vncInput.h" #include "vncExtInit.h" #include "RFBGlue.h" diff --git a/unix/xserver/hw/vnc/Input.h b/unix/xserver/hw/vnc/vncInput.h similarity index 94% rename from unix/xserver/hw/vnc/Input.h rename to unix/xserver/hw/vnc/vncInput.h index a9d067f2..08cab6cb 100644 --- a/unix/xserver/hw/vnc/Input.h +++ b/unix/xserver/hw/vnc/vncInput.h @@ -19,9 +19,8 @@ * USA. */ -/* Make sure macro doesn't conflict with macro in include/input.h. */ -#ifndef INPUT_H_ -#define INPUT_H_ +#ifndef __VNCINPUT_H__ +#define __VNCINPUT_H__ #include #include diff --git a/unix/xserver/hw/vnc/InputXKB.c b/unix/xserver/hw/vnc/vncInputXKB.c similarity index 99% rename from unix/xserver/hw/vnc/InputXKB.c rename to unix/xserver/hw/vnc/vncInputXKB.c index de6c1d3a..d5fe286a 100644 --- a/unix/xserver/hw/vnc/InputXKB.c +++ b/unix/xserver/hw/vnc/vncInputXKB.c @@ -36,7 +36,7 @@ #include "scrnintstr.h" #include "mi.h" -#include "Input.h" +#include "vncInput.h" #ifndef KEYBOARD_OR_FLOAT #define KEYBOARD_OR_FLOAT MASTER_KEYBOARD -- 2.39.5