From 0e32c002ae0e8fd5c090630803625b5a4774670a Mon Sep 17 00:00:00 2001
From: Patryk Obara <dreamer.tan@gmail.com>
Date: Tue, 18 Feb 2020 20:19:30 +0100
Subject: [PATCH] Cleanup ifdef guards in serialport misc util

---
 include/support.h                     |  7 ++-----
 src/hardware/serialport/misc_util.cpp |  2 +-
 src/hardware/serialport/misc_util.h   | 12 ++++--------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/include/support.h b/include/support.h
index 90fc1324..4da74234 100644
--- a/include/support.h
+++ b/include/support.h
@@ -16,18 +16,16 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef DOSBOX_SUPPORT_H
 #define DOSBOX_SUPPORT_H
 
+#include "dosbox.h"
+
 #include <algorithm>
 #include <cstdio>
 #include <ctype.h>
 #include <string.h>
 #include <string>
-#ifndef DOSBOX_DOSBOX_H
-#include "dosbox.h"
-#endif
 
 #ifdef _MSC_VER
 #define strcasecmp(a, b) _stricmp(a, b)
@@ -100,5 +98,4 @@ void upcase(std::string &str);
 void lowcase(std::string &str);
 void strip_punctuation(std::string &str);
 
-
 #endif
diff --git a/src/hardware/serialport/misc_util.cpp b/src/hardware/serialport/misc_util.cpp
index ce1caecd..99e34f36 100644
--- a/src/hardware/serialport/misc_util.cpp
+++ b/src/hardware/serialport/misc_util.cpp
@@ -290,4 +290,4 @@ TCPClientSocket* TCPServerSocket::Accept() {
 	return new TCPClientSocket(new_tcpsock);
 }
 
-#endif // #if C_MODEM
+#endif // C_MODEM
diff --git a/src/hardware/serialport/misc_util.h b/src/hardware/serialport/misc_util.h
index 6a433065..8a90ba7d 100644
--- a/src/hardware/serialport/misc_util.h
+++ b/src/hardware/serialport/misc_util.h
@@ -16,18 +16,14 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef SDLNETWRAPPER_H
-#define SDLNETWRAPPER_H
+#ifndef DOSBOX_MISC_UTIL_H
+#define DOSBOX_MISC_UTIL_H
 
-#ifndef DOSBOX_DOSBOX_H
 #include "dosbox.h"
-#endif
 
 #if C_MODEM
 
-# ifndef DOSBOX_SUPPORT_H
 #include "support.h"
-#endif
 
 // Netwrapper Capabilities
 #define NETWRAPPER_TCP 1
@@ -110,6 +106,6 @@ struct TCPServerSocket {
 	TCPClientSocket* Accept();
 };
 
-#endif //C_MODEM
+#endif // C_MODEM
 
-#endif //# SDLNETWRAPPER_H
+#endif