Skip to content

Commit 0b6cf59

Browse files
committed
fixed somw windows releated issues
1 parent b835bd8 commit 0b6cf59

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

src/VirtualDMD.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "xbrz/xbrz.h"
66
#include "FrameUtil.h"
77

8-
void VirtualDMD::Update(uint8_t* pData, u_int16_t width, u_int16_t height)
8+
void VirtualDMD::Update(uint8_t* pData, uint16_t width, uint16_t height)
99
{
1010
if (width == 0) width = m_width;
1111
if (height == 0) height = m_height;

src/backbox.cpp

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,18 @@ void signal_handler(int sig)
161161

162162
int main(int argc, char* argv[])
163163
{
164-
signal(SIGHUP, signal_handler);
165164
signal(SIGINT, signal_handler);
166-
signal(SIGKILL, signal_handler);
167165
signal(SIGTERM, signal_handler);
168-
signal(SIGQUIT, signal_handler);
169166
signal(SIGABRT, signal_handler);
167+
#ifdef SIGHUP
168+
signal(SIGHUP, signal_handler);
169+
#endif
170+
#ifdef SIGKILL
171+
signal(SIGKILL, signal_handler);
172+
#endif
173+
#ifdef SIGQUIT
174+
signal(SIGQUIT, signal_handler);
175+
#endif
170176

171177
char identifier;
172178
cag_option_context cag_context;

src/ppuc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ struct LogCallbackTraits<R (*)(A1, A2, A3, A4)>
8181
using Arg3 = A3;
8282
};
8383

84-
#if defined(_WIN32) || defined(_WIN64)
84+
#if defined(_WIN32) && !defined(_WIN64)
8585
template <typename R, typename A1, typename A2, typename A3, typename A4>
8686
struct LogCallbackTraits<R(__stdcall *)(A1, A2, A3, A4)>
8787
{

0 commit comments

Comments
 (0)