chore: remove basic_types.h

src/lib/arch/IArchString.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/IInterface.h"
-#include "common/basic_types.h"
+#include "common/common.h"
 
 #include <stdarg.h>
 

src/lib/base/Event.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "common/basic_types.h"
+#include "common/common.h"
 #include "common/stdmap.h"
 
 class EventData

src/lib/base/IEventQueueBuffer.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "common/IInterface.h"
-#include "common/basic_types.h"
+#include "common/common.h"
 
 class Event;
 class EventQueueTimer;

src/lib/base/Unicode.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "arch/IArchString.h"
-#include "common/basic_types.h"
+#include "common/common.h"
 #include <string>
 
 //! Unicode utility functions

src/lib/base/log_outputters.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "base/ILogOutputter.h"
-#include "common/basic_types.h"
+#include "common/common.h"
 #include "common/stddeque.h"
 #include "mt/Thread.h"
 

src/lib/client/HelloBack.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common/basic_types.h"
+#include "common/common.h"
 #include "deskflow/protocol_types.h"
 #include "io/IStream.h"
 

src/lib/common/CMakeLists.txt

@@ -6,7 +6,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON)
 configure_file(constants.h.in constants.h @ONLY)
 
 add_library(common INTERFACE
-  basic_types.h
   common.h
   IInterface.h
   ipc.h

src/lib/common/basic_types.h

@@ -1,95 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2002 Chris Schoeneman
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "common.h"
-
-// VC++ has built-in sized types
-// moved from common.h (why was it there?)
-#if defined(_MSC_VER)
-#include <wchar.h>
-#define TYPE_OF_SIZE_1 __int8
-#define TYPE_OF_SIZE_2 __int16
-#define TYPE_OF_SIZE_4 __int32
-#endif
-
-//
-// pick types of particular sizes
-//
-
-#if !defined(TYPE_OF_SIZE_1)
-#if SIZEOF_CHAR == 1
-#define TYPE_OF_SIZE_1 char
-#endif
-#endif
-
-#if !defined(TYPE_OF_SIZE_2)
-#if SIZEOF_INT == 2
-#define TYPE_OF_SIZE_2 int
-#else
-#define TYPE_OF_SIZE_2 short
-#endif
-#endif
-
-#if !defined(TYPE_OF_SIZE_4)
-// Carbon defines SInt32 and UInt32 in terms of long
-#if SIZEOF_INT == 4 && !defined(__APPLE__)
-#define TYPE_OF_SIZE_4 int
-#else
-#define TYPE_OF_SIZE_4 long
-#endif
-#endif
-
-//
-// verify existence of required types
-//
-
-#if !defined(TYPE_OF_SIZE_1)
-#error No 1 byte integer type
-#endif
-#if !defined(TYPE_OF_SIZE_2)
-#error No 2 byte integer type
-#endif
-#if !defined(TYPE_OF_SIZE_4)
-#error No 4 byte integer type
-#endif
-
-//
-// make typedefs
-//
-// except for SInt8 and UInt8 these types are only guaranteed to be
-// at least as big as indicated (in bits).  that is, they may be
-// larger than indicated.
-//
-
-// Added this because it doesn't compile on OS X 10.6 because they are already
-// defined in Carbon
-#if !defined(__MACTYPES__)
-#if defined(__APPLE__)
-#include <CoreServices/CoreServices.h>
-#else
-#endif
-#endif
-//
-// clean up
-//
-
-#undef TYPE_OF_SIZE_1
-#undef TYPE_OF_SIZE_2
-#undef TYPE_OF_SIZE_4

src/lib/common/common.h

@@ -36,6 +36,14 @@
 #include <stdlib.h>
 #include <string.h>
 
+// defined in Carbon
+#if !defined(__MACTYPES__)
+#if defined(__APPLE__)
+#include <CoreServices/CoreServices.h>
+#else
+#endif
+#endif
+
 enum
 {
   kExitSuccess = 0,     // successful completion

src/lib/common/ipc.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "basic_types.h"
+#include "common.h"
 
 enum class IpcMessageType : uint8_t
 {

src/lib/deskflow/Chunk.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "common/basic_types.h"
+#include "common/common.h"
 #include <base/EventTypes.h>
 
 class Chunk : public EventData

src/lib/deskflow/ClipboardChunk.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "common/basic_types.h"
+#include "common/common.h"
 #include "deskflow/Chunk.h"
 #include "deskflow/clipboard_types.h"
 

src/lib/deskflow/FileChunk.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "common/basic_types.h"
+#include "common/common.h"
 #include "deskflow/Chunk.h"
 
 #include <string>

src/lib/deskflow/clipboard_types.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "common/basic_types.h"
+#include "common/common.h"
 
 //! Clipboard ID
 /*!

src/lib/deskflow/key_types.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "common/basic_types.h"
+#include "common/common.h"
 
 //! Key ID
 /*!

src/lib/mt/CondVar.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "common/basic_types.h"
+#include "common/common.h"
 #include "mt/Mutex.h"
 
 class Stopwatch;

src/lib/net/XSocket.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "base/XBase.h"
-#include "common/basic_types.h"
+#include "common/common.h"
 #include "io/XIO.h"
 
 //! Generic socket exception

src/lib/platform/XWindowsClipboard.cpp

@@ -21,7 +21,7 @@
 #include "arch/Arch.h"
 #include "base/Log.h"
 #include "base/Stopwatch.h"
-#include "common/basic_types.h"
+#include "common/common.h"
 #include "common/stdvector.h"
 #include "platform/XWindowsClipboardBMPConverter.h"
 #include "platform/XWindowsClipboardHTMLConverter.h"

src/test/unittests/client/HelloBackTests.cpp

@@ -7,7 +7,7 @@
 
 #include "client/HelloBack.h"
 
-#include "common/basic_types.h"
+#include "common/common.h"
 #include "mock/io/MockStream.h"
 
 #include <array>