ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/4coder/4coder

This commit is contained in:
Allen Webster 2017-11-11 11:27:06 -05:00
parent 3286519fb0 7c05edf13c
commit a01fe50280
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/4ed_file_moving.h
View File

@ -74,10 +74,10 @@ internal void fm_slash_fix(char *path);
// Memory concat helpers // Memory concat helpers
internal char *fm_prepare_string_internal(char *s1, ...); internal char *fm_prepare_string_internal(char *s1, ...);
#define fm_str(...) fm_prepare_string_internal(__VA_ARGS__, 0) #define fm_str(...) fm_prepare_string_internal(__VA_ARGS__, (void*)0)
internal char **fm_prepare_list_internal(char **l1, ...); internal char **fm_prepare_list_internal(char **l1, ...);
#define fm_list(...) fm_prepare_list_internal(__VA_ARGS__, 0) #define fm_list(...) fm_prepare_list_internal(__VA_ARGS__, (void*)0)
internal char **fm_list_one_item(char *item); internal char **fm_list_one_item(char *item);

8
platform_win32/win32_4ed.cpp
View File

@ -540,10 +540,10 @@ Win32Resize(i32 width, i32 height){
#define GLFuncGood(f) (((f)!=0)&&((f)!=(void*)1)&&((f)!=(void*)2)&&((f)!=(void*)3)&&((f)!=(void*)-11)) #define GLFuncGood(f) (((f)!=0)&&((f)!=(void*)1)&&((f)!=(void*)2)&&((f)!=(void*)3)&&((f)!=(void*)-11))
typedef HGLRC CALL_CONVENTION (wglCreateContextAttribsARB_Function)(HDC,HGLRC,i32*); typedef HGLRC (CALL_CONVENTION wglCreateContextAttribsARB_Function)(HDC,HGLRC,i32*);
typedef BOOL CALL_CONVENTION (wglChoosePixelFormatARB_Function)(HDC,i32*,f32*,u32,i32*,u32*); typedef BOOL (CALL_CONVENTION wglChoosePixelFormatARB_Function)(HDC,i32*,f32*,u32,i32*,u32*);
typedef char* CALL_CONVENTION (wglGetExtensionsStringEXT_Function)(); typedef char* (CALL_CONVENTION wglGetExtensionsStringEXT_Function)();
typedef VOID CALL_CONVENTION (wglSwapIntervalEXT_Function)(i32); typedef VOID (CALL_CONVENTION wglSwapIntervalEXT_Function)(i32);
global wglCreateContextAttribsARB_Function *wglCreateContextAttribsARB = 0; global wglCreateContextAttribsARB_Function *wglCreateContextAttribsARB = 0;
global wglChoosePixelFormatARB_Function *wglChoosePixelFormatARB = 0; global wglChoosePixelFormatARB_Function *wglChoosePixelFormatARB = 0;