fixed: linux compile errors from last checkin

src/cmd/synergyc/XWindowsClientTaskBarReceiver.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "synergyc/ClientTaskBarReceiver.h"
+#include "synergy/ClientTaskBarReceiver.h"
 
 class CBufferedLogOutputter;
 class IEventQueue;

src/cmd/synergys/XWindowsServerTaskBarReceiver.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "synergys/ServerTaskBarReceiver.h"
+#include "synergy/ServerTaskBarReceiver.h"
 
 class CBufferedLogOutputter;
 class IEventQueue;

src/lib/arch/unix/ArchConsoleUnix.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchConsoleUnix.h"
+#include "arch/unix/ArchConsoleUnix.h"
 
 CArchConsoleUnix::CArchConsoleUnix() { }
 

src/lib/arch/unix/ArchDaemonUnix.cpp

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchDaemonUnix.h"
+#include "arch/unix/ArchDaemonUnix.h"
-#include "arch/XArchUnix.h"
+
+#include "arch/unix/XArchUnix.h"
 #include "base/Log.h"
 
 #include <unistd.h>

src/lib/arch/unix/ArchFileUnix.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchFileUnix.h"
+#include "arch/unix/ArchFileUnix.h"
 
 #include <stdio.h>
 #include <unistd.h>

src/lib/arch/unix/ArchInternetUnix.cpp

@@ -15,7 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchInternetUnix.h"
+#include "arch/unix/ArchInternetUnix.h"
+
 #include "arch/XArch.h"
 #include "common/Version.h"
 #include "base/Log.h"

src/lib/arch/unix/ArchLogUnix.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchLogUnix.h"
+#include "arch/unix/ArchLogUnix.h"
 
 #include <syslog.h>
 

src/lib/arch/unix/ArchLogUnix.h

@@ -34,5 +34,3 @@ public:
 	virtual void		showLog(bool);
 	virtual void		writeLog(ELevel, const char*);
 };
-
-#endif

src/lib/arch/unix/ArchMultithreadPosix.cpp

@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchMultithreadPosix.h"
+#include "arch/unix/ArchMultithreadPosix.h"
+
 #include "arch/Arch.h"
 #include "arch/XArch.h"
 

src/lib/arch/unix/ArchNetworkBSD.cpp

@@ -16,10 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchNetworkBSD.h"
+#include "arch/unix/ArchNetworkBSD.h"
+
+#include "arch/unix/ArchMultithreadPosix.h"
+#include "arch/unix/XArchUnix.h"
 #include "arch/Arch.h"
-#include "arch/ArchMultithreadPosix.h"
-#include "arch/XArchUnix.h"
 
 #if HAVE_UNISTD_H
 #	include <unistd.h>

src/lib/arch/unix/ArchPluginUnix.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchPluginUnix.h"
+#include "arch/unix/ArchPluginUnix.h"
 
 CArchPluginUnix::CArchPluginUnix()
 {

src/lib/arch/unix/ArchSleepUnix.cpp

@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchSleepUnix.h"
+#include "arch/unix/ArchSleepUnix.h"
+
 #include "arch/Arch.h"
 
 #if TIME_WITH_SYS_TIME

src/lib/arch/unix/ArchStringUnix.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchStringUnix.h"
+#include "arch/unix/ArchStringUnix.h"
 
 #include <stdio.h>
 

src/lib/arch/unix/ArchSystemUnix.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchSystemUnix.h"
+#include "arch/unix/ArchSystemUnix.h"
 
 #include <sys/utsname.h>
 

src/lib/arch/unix/ArchTaskBarXWindows.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/win32/ArchTaskBarXWindows.h"
+#include "arch/unix/ArchTaskBarXWindows.h"
 
 //
 // CArchTaskBarXWindows

src/lib/arch/unix/ArchTimeUnix.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchTimeUnix.h"
+#include "arch/unix/ArchTimeUnix.h"
 
 #if TIME_WITH_SYS_TIME
 #	include <sys/time.h>

src/lib/arch/unix/XArchUnix.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/XArchUnix.h"
+#include "arch/unix/XArchUnix.h"
 
 #include <cstring>
 

src/lib/platform/XWindowsClipboard.h

@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "synergy/clipboard_types.h"
 #include "synergy/IClipboard.h"
-#include "synerty/ClipboardTypes.h"
 #include "common/stdmap.h"
 #include "common/stdlist.h"
 #include "common/stdvector.h"

src/lib/platform/XWindowsKeyState.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "base/KeyState.h"
+#include "synergy/KeyState.h"
 #include "common/stdmap.h"
 #include "common/stdvector.h"
 

src/lib/platform/XWindowsUtil.cpp

@@ -18,7 +18,7 @@
 
 #include "platform/XWindowsUtil.h"
 
-#include "platform/KeyTypes.h"
+#include "synergy/key_types.h"
 #include "mt/Thread.h"
 #include "base/Log.h"
 #include "base/StringUtil.h"