Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gcc14 fixes #536

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions GLideN64/src/Graphics/OpenGLContext/GLFunctions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
#define ASSIGN_GL_PROC_ADR(proc_type, proc_name) ptr##proc_name = gl##proc_name

#if defined(GL_USE_DLSYM)

#ifndef _DLFCN_H
#include <dlfcn.h>
#endif

// Use dlsym() to load GL symbols from the default shared object search order
#define GL_GET_PROC_ADR(proc_type, proc_name) ptr##proc_name = (proc_type) dlsym(RTLD_DEFAULT, "gl"#proc_name)
#else
Expand Down
1 change: 1 addition & 0 deletions custom/dependencies/libzlib/gzguts.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#endif

#include <stdio.h>
#include <unistd.h>
#include "zlib.h"
#ifdef STDC
# include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion libretro/libretro.c
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ void retro_init(void)
initializing = true;

retro_thread = co_active();
game_thread = co_create(65536 * sizeof(void*) * 16, EmuThreadFunction);
game_thread = co_create(65536 * sizeof(void*) * 16, (void(*)(void))EmuThreadFunction);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think 26dfd67 is a bit better than this workaround.

}

m64p_error ret = CoreStartup(FRONTEND_API_VERSION, ".", ".", NULL, n64DebugCallback, 0, n64StateCallback);
Expand Down
2 changes: 1 addition & 1 deletion mupen64plus-core/subprojects/minizip/zip.c
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename,
unsigned char bufHead[RAND_HEAD_LEN];
unsigned int sizeHead;
zi->ci.encrypt = 1;
zi->ci.pcrc_32_tab = get_crc_table();
zi->ci.pcrc_32_tab = (const long unsigned int *)get_crc_table();
/*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/

sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
Expand Down
1 change: 1 addition & 0 deletions mupen64plus-rsp-paraLLEl/rsp_disasm.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "rsp_disasm.hpp"
#include <assert.h>
#include <cstdint>

namespace RSP
{
Expand Down
1 change: 1 addition & 0 deletions mupen64plus-rsp-paraLLEl/rsp_disasm.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <stdint.h>
#include <string>
#include <cstdint>

namespace RSP
{
Expand Down
1 change: 1 addition & 0 deletions mupen64plus-video-angrylion/parallel_al.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <stdexcept>
#include <thread>
#include <vector>
#include <stdexcept>

class Parallel
{
Expand Down