diff --git a/Common/3dParty/socketio/patches/sio_client_impl_encode.patch b/Common/3dParty/socketio/patches/sio_client_impl_encode.patch deleted file mode 100644 index d7021d6b59..0000000000 --- a/Common/3dParty/socketio/patches/sio_client_impl_encode.patch +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< - if((c >= 'a' && c <= 'z') || (c>= 'A' && c<= 'Z') || (c >= '0' && c<= '9')){ -======= - if((c >= 'a' && c <= 'z') || (c>= 'A' && c<= 'Z') || (c >= '0' && c<= '9') || ('-' == c) || ('_' == c) || ('.' == c) || ('~' == c)){ ->>>>>>> diff --git a/PdfFile/SrcWriter/Utils.h b/PdfFile/SrcWriter/Utils.h index 8375787182..d737624c3d 100644 --- a/PdfFile/SrcWriter/Utils.h +++ b/PdfFile/SrcWriter/Utils.h @@ -33,7 +33,6 @@ #define _PDF_WRITER_SRC_UTILS_H #include "Types.h" -#include #define NEEDS_ESCAPE(c) (c < 0x21 || \ c > 0x7e || \