diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /games/openbor/files/patch-source_utils.c | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'games/openbor/files/patch-source_utils.c')
| -rw-r--r-- | games/openbor/files/patch-source_utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/games/openbor/files/patch-source_utils.c b/games/openbor/files/patch-source_utils.c index 432d628ddb4d..4ddf806e9963 100644 --- a/games/openbor/files/patch-source_utils.c +++ b/games/openbor/files/patch-source_utils.c @@ -6,14 +6,14 @@ source/utils.c:303:64: error: member reference base type 'int' is not a structur writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); ~~~~~~~~~~^~~~~~ ---- source/utils.c.orig 2024-04-23 23:32:41 UTC +--- source/utils.c.orig 2025-11-07 17:12:42 UTC +++ source/utils.c -@@ -303,7 +303,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f +@@ -258,7 +258,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f "\n* Shutting Down *\n\n"); writeToLogFile("Out of memory!\n"); writeToLogFile("Allocation of size %i failed in function '%s' at %s:%i.\n", size, func, file, line); --#if LINUX && !DARWIN -+#if defined(__GLIBC__) || defined(ANDROID) || defined(VITA) +-#if LINUX && !DARWIN && !ANDROID ++#if defined(__GLIBC__) || defined(VITA) writeToLogFile("Memory usage at exit: %u\n", mallinfo2().arena); #else writeToLogFile("Memory usage at exit: %u\n", getUsedRam(BYTES)); |