271cb25988
- patted portlint - patches are now makepatch compliant PR: 210058 Changes: http://vba-m.com/forum/showthread.php?tid=1037&pid=6091#pid6091 http://vba-m.com/forum/showthread.php?tid=1036&pid=6090#pid6090 Submitted by: Piotr Kubaj <pkubaj@anongoth.pl> Reviewed by: pawel Approved by: Allison N. Reid <root@cooltrainer.org> (maintainer)
23 lines
578 B
C++
23 lines
578 B
C++
--- src/gba/GBALink.cpp.orig 2016-08-13 15:20:47 UTC
|
|
+++ src/gba/GBALink.cpp
|
|
@@ -2,9 +2,10 @@
|
|
// with major changes by tjm
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
+#include <sys/param.h>
|
|
|
|
// malloc.h does not seem to exist on Mac OS 10.7
|
|
-#ifdef __APPLE__
|
|
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__)
|
|
#include <stdlib.h>
|
|
#else
|
|
#include <malloc.h>
|
|
@@ -89,7 +90,7 @@ bool speedhack = true;
|
|
#include "GBALink.h"
|
|
#include "GBASockClient.h"
|
|
|
|
-#include <SFML/Network.hpp>
|
|
+#include <SFML1/Network.hpp>
|
|
|
|
#ifdef ENABLE_NLS
|
|
#include <libintl.h>
|