Skip to content

Commit

Permalink
Merge pull request #109 from JVeg199X/mac-os-via-x11-fixes
Browse files Browse the repository at this point in the history
Remove references to malloc.h
  • Loading branch information
cnlohr authored May 13, 2024
2 parents b4ed509 + 3f6a635 commit a53ea30
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 12 deletions.
1 change: 0 additions & 1 deletion CNFGFunctions.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ OTHER DEALINGS IN THE SOFTWARE.

//TODO: Refactor to remove malloc reliance.
#ifndef __clang__
#include <malloc.h>
#endif

int CNFGPenX, CNFGPenY;
Expand Down
1 change: 0 additions & 1 deletion CNFGHTTP.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@


#include <stdint.h>
#include <malloc.h>

typedef struct {
uint32_t state[5];
Expand Down
1 change: 0 additions & 1 deletion CNFGWinDriver.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "CNFG.h"
#include <windows.h>
#include <stdlib.h>
#include <malloc.h> //for alloca
#include <ctype.h>

HBITMAP CNFGlsBitmap;
Expand Down
1 change: 0 additions & 1 deletion CNFGXDriver.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

#include <stdio.h>
#include <stdlib.h>
#include <malloc.h>

#ifdef HAS_XINERAMA
#include <X11/extensions/shape.h>
Expand Down
8 changes: 0 additions & 8 deletions rawdraw_sf.h
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,6 @@ int CNFGLastScancode = 0;


#include <stdint.h>
#include <malloc.h>

typedef struct {
uint32_t state[5];
Expand Down Expand Up @@ -3366,7 +3365,6 @@ void CNFGHandleInput()

#include <windows.h>
#include <stdlib.h>
#include <malloc.h> //for alloca
#include <ctype.h>

HBITMAP CNFGlsBitmap;
Expand Down Expand Up @@ -5550,7 +5548,6 @@ void AndroidSendToBack( int param )

#include <stdio.h>
#include <stdlib.h>
#include <malloc.h>

#ifdef HAS_XINERAMA
#include <X11/extensions/shape.h>
Expand Down Expand Up @@ -6559,11 +6556,6 @@ OTHER DEALINGS IN THE SOFTWARE.
#include "TextTool/FontData.h"
#endif

//TODO: Refactor to remove malloc reliance.
#ifndef __clang__
#include <malloc.h>
#endif

int CNFGPenX, CNFGPenY;
uint32_t CNFGBGColor;
uint32_t CNFGLastColor;
Expand Down

0 comments on commit a53ea30

Please sign in to comment.