From 53490ec797b415fb5bef4bafacfa7b13359081db Mon Sep 17 00:00:00 2001
From: lif <>
Date: Sun, 24 Dec 2023 00:06:56 -0800
Subject: [PATCH] just make the ifdef N64

---
 Makefile                                      |  2 +-
 .../libretro-common/vfs/vfs_implementation.c  | 24 +++++++++----------
 mips/mips_stub.S                              |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 4d7f15c..5aa9edb 100644
--- a/Makefile
+++ b/Makefile
@@ -442,7 +442,7 @@ else ifeq ($(platform), n64)
 	AR = $(N64_INST)/bin/mips64-elf-ar$(EXE_EXT)
 	CFLAGS += -fomit-frame-pointer -ffast-math
 	CFLAGS += -march=vr4300 -mtune=vr4300 -falign-functions=32
-	CFLAGS += -DNINTENDO64 -DUSE_RGBA5551_FORMAT -DSMALL_TRANSLATION_CACHE -DROM_BUFFER_SIZE=1
+	CFLAGS += -DN64 -DUSE_RGBA5551_FORMAT -DSMALL_TRANSLATION_CACHE -DROM_BUFFER_SIZE=1
 	CFLAGS += -I$(N64_INST)/include/
 	HAVE_DYNAREC = 0
 	CPU_ARCH := mips
diff --git a/libretro/libretro-common/vfs/vfs_implementation.c b/libretro/libretro-common/vfs/vfs_implementation.c
index 54636bb..c5acb26 100644
--- a/libretro/libretro-common/vfs/vfs_implementation.c
+++ b/libretro/libretro-common/vfs/vfs_implementation.c
@@ -51,12 +51,12 @@
 #  if defined(PSP)
 #    include <pspiofilemgr.h>
 #  endif
-#  if defined(NINTENDO64)
+#  if defined(N64)
 #    include <libdragon.h>
 #  endif
 #  include <sys/types.h>
 #  include <sys/stat.h>
-#  if !defined(VITA) && !defined(NINTENDO64)
+#  if !defined(VITA) && !defined(N64)
 #  include <dirent.h>
 #  endif
 #  include <unistd.h>
@@ -78,7 +78,7 @@
 #  endif
 #  include <sys/types.h>
 #  include <sys/stat.h>
-#  if !defined(NINTENDO64)
+#  if !defined(N64)
 #    include <dirent.h>
 #  endif
 #  include <unistd.h>
@@ -620,7 +620,7 @@ int64_t retro_vfs_file_truncate_impl(libretro_vfs_implementation_file *stream, i
 	   stream->size = length;
 	   return 0;
    }
-#elif !defined(VITA) && !defined(PSP) && !defined(PS2) && !defined(ORBIS) && (!defined(SWITCH) || defined(HAVE_LIBNX)) && !defined(NINTENDO64)
+#elif !defined(VITA) && !defined(PSP) && !defined(PS2) && !defined(ORBIS) && (!defined(SWITCH) || defined(HAVE_LIBNX)) && !defined(N64)
    if (stream && ftruncate(fileno(stream->fp), (off_t)length) == 0)
    {
       stream->size = length;
@@ -1026,7 +1026,7 @@ int retro_vfs_mkdir_impl(const char *dir)
          free(dir_buf);
       }
    }
-#elif defined(NINTENDO64)
+#elif defined(N64)
    int ret = 0;
    return -1;
 #else
@@ -1061,7 +1061,7 @@ struct libretro_vfs_implementation_dir
    int error;
    int directory;
    sysFSDirent entry;
-#elif defined(NINTENDO64)
+#elif defined(N64)
    bool directory;
    unsigned flags;
    char path[1024];
@@ -1140,7 +1140,7 @@ libretro_vfs_implementation_dir *retro_vfs_opendir_impl(
    rdir->entry           = NULL;
 #elif defined(__PSL1GHT__) || defined(__PS3__)
    rdir->error           = sysFsOpendir(name, &rdir->directory);
-#elif defined(NINTENDO64)
+#elif defined(N64)
    if (dfs_chdir(name) != DFS_ESUCCESS) return NULL;
    rdir->flags = 0xff;
    rdir->directory = true;
@@ -1182,7 +1182,7 @@ bool retro_vfs_readdir_impl(libretro_vfs_implementation_dir *rdir)
    uint64_t nread;
    rdir->error = sysFsReaddir(rdir->directory, &rdir->entry, &nread);
    return (nread != 0);
-#elif defined(NINTENDO64)
+#elif defined(N64)
    if (rdir->flags == 0xff) {
       rdir->flags = dfs_dir_findfirst(".", rdir->path);
    } else {
@@ -1209,7 +1209,7 @@ const char *retro_vfs_dirent_get_name_impl(libretro_vfs_implementation_dir *rdir
    return (char*)rdir->entry.cFileName;
 #elif defined(VITA) || defined(__PSL1GHT__) || defined(__PS3__)
    return rdir->entry.d_name;
-#elif defined(NINTENDO64)
+#elif defined(N64)
    return rdir->path;
 #else
    if (!rdir || !rdir->entry)
@@ -1229,7 +1229,7 @@ bool retro_vfs_dirent_is_dir_impl(libretro_vfs_implementation_dir *rdir)
 #elif defined(__PSL1GHT__) || defined(__PS3__)
    sysFSDirent *entry          = (sysFSDirent*)&rdir->entry;
    return (entry->d_type == FS_TYPE_DIR);
-#elif defined(NINTENDO64)
+#elif defined(N64)
    return rdir->flags & FLAGS_DIR;
 #else
    struct stat buf;
@@ -1262,8 +1262,8 @@ int retro_vfs_closedir_impl(libretro_vfs_implementation_dir *rdir)
    sceIoDclose(rdir->directory);
 #elif defined(__PSL1GHT__) || defined(__PS3__)
    rdir->error = sysFsClosedir(rdir->directory);
-#elif defined(NINTENDO64)
-   
+#elif defined(N64)
+
 #else
    if (rdir->directory)
       closedir(rdir->directory);
diff --git a/mips/mips_stub.S b/mips/mips_stub.S
index f623ac3..2c92f19 100644
--- a/mips/mips_stub.S
+++ b/mips/mips_stub.S
@@ -615,7 +615,7 @@ fnptrs:
 
 # Make this section executable!
 .text
-#if defined(PSP) || defined(PS2) || defined(NINTENDO64)
+#if defined(PSP) || defined(PS2) || defined(N64)
   .section .bss
 #else
   # Need to mark the section as awx (for Linux)