Merge branch 'pandora' of https://github.com/reicast/emulator into pandora

2014-08-18 23:03:05 +02:00 · 2014-08-18 23:03:05 +02:00 · 763e0948c0
parent 2c651298d5 e512eca05b
commit 763e0948c0
2 changed files with 2 additions and 2 deletions
--- a/core/core.mk
+++ b/core/core.mk
@ -83,4 +83,4 @@ ifdef NO_REC
  RZDCY_CFLAGS += -DHOST_NO_REC
 endif

-RZDCY_CXXFLAGS := $(RZDCY_CFLAGS) -fno-exceptions -fno-rtti -std=gnu++11
+RZDCY_CXXFLAGS := $(RZDCY_CFLAGS) -fno-exceptions -fno-rtti -std=gnu++11
--- a/core/deps/libwebsocket/lws-plat-win.c
+++ b/core/deps/libwebsocket/lws-plat-win.c
@ -362,4 +362,4 @@ lws_plat_inet_ntop(int af, const void *src, char *dst, int cnt)
 	return ok ? dst : NULL;
 }

-#endif
+#endif