mirror of
https://github.com/RGBCube/serenity
synced 2025-10-31 21:32:44 +00:00
51315c0b1d
Co-Authored-By: Tim Schumacher <timschumi@gmx.de> (thanks for the line ending and assert() troubleshooting)
54 lines
2.6 KiB
Diff
54 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Grigoris Pavlakis <grigpavl@ece.auth.gr>
|
|
Date: Fri, 17 Jun 2022 19:26:30 +0300
|
|
Subject: [PATCH] Add SerenityOS in platform-specific defines
|
|
|
|
---
|
|
desktop_version/src/FileSystemUtils.cpp | 6 +++---
|
|
third_party/tinyxml2/tinyxml2.cpp | 2 +-
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/desktop_version/src/FileSystemUtils.cpp b/desktop_version/src/FileSystemUtils.cpp
|
|
index 833a3de..22372f2 100644
|
|
--- a/desktop_version/src/FileSystemUtils.cpp
|
|
+++ b/desktop_version/src/FileSystemUtils.cpp
|
|
@@ -26,7 +26,7 @@ int mkdir(char* path, int mode)
|
|
return CreateDirectoryW(utf16_path, NULL);
|
|
}
|
|
#define VNEEDS_MIGRATION (mkdirResult != 0)
|
|
-#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__)
|
|
+#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__) || defined (__serenity__)
|
|
#include <unistd.h>
|
|
#include <dirent.h>
|
|
#include <limits.h>
|
|
@@ -1005,7 +1005,7 @@ static void PLATFORM_migrateSaveData(char* output)
|
|
char oldLocation[MAX_PATH];
|
|
char newLocation[MAX_PATH];
|
|
char oldDirectory[MAX_PATH];
|
|
-#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__)
|
|
+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__) || defined (__serenity__)
|
|
DIR *dir = NULL;
|
|
struct dirent *de = NULL;
|
|
DIR *subDir = NULL;
|
|
@@ -1018,7 +1018,7 @@ static void PLATFORM_migrateSaveData(char* output)
|
|
return;
|
|
}
|
|
const char oldPath[] =
|
|
- #if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__)
|
|
+ #if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) || defined(__DragonFly__) || defined (__serenity__)
|
|
"/.vvvvvv/";
|
|
#elif defined(__APPLE__)
|
|
"/Documents/VVVVVV/";
|
|
diff --git a/third_party/tinyxml2/tinyxml2.cpp b/third_party/tinyxml2/tinyxml2.cpp
|
|
index 1606ce0..d78c6ba 100644
|
|
--- a/third_party/tinyxml2/tinyxml2.cpp
|
|
+++ b/third_party/tinyxml2/tinyxml2.cpp
|
|
@@ -103,7 +103,7 @@ distribution.
|
|
#if defined(_WIN64)
|
|
#define TIXML_FSEEK _fseeki64
|
|
#define TIXML_FTELL _ftelli64
|
|
-#elif defined(__APPLE__) || (__FreeBSD__) || (__OpenBSD__)
|
|
+#elif defined(__APPLE__) || (__FreeBSD__) || (__OpenBSD__) || (__serenity__)
|
|
#define TIXML_FSEEK fseeko
|
|
#define TIXML_FTELL ftello
|
|
#elif defined(__unix__) && defined(__x86_64__)
|