valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Cleanup ifdef guards in serialport misc util

Browse source
This commit is contained in:
Patryk Obara 2020-02-18 20:19:30 +01:00 • committed by Patryk Obara
parent 651aeb906c
commit 0e32c002ae
3 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/support.h
View file

@ -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

2
src/hardware/serialport/misc_util.cpp
View file

@ -290,4 +290,4 @@ TCPClientSocket* TCPServerSocket::Accept() {
return new TCPClientSocket(new_tcpsock);
}
#endif // #if C_MODEM
#endif // C_MODEM

12
src/hardware/serialport/misc_util.h
View file

@ -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