Skip to content

Commit

Permalink
Fix a few small syntax issues that throw errors or warnings in GCC.
Browse files Browse the repository at this point in the history
For now, this is everything we can do that doesn't break the Visual Studio
build in turn. I'd like to be able to actually *test* the build before
committing a solution for for how we're going to handle breakpoint_process()
in GCC, and since I've pretty much given up on porting this project to CMake
or qmake myself (see #39), that's not going to happen in the foreseeable
future.
  • Loading branch information
nmlgc committed May 29, 2015
1 parent ab7593f commit e518fc3
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion thcrap/src/specs.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Specifications for various versions of file formats used by a game.
*/

#include <thcrap.h>
#include "thcrap.h"

void specs_mod_init(void)
{
Expand Down
6 changes: 3 additions & 3 deletions thcrap/src/textdisp.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@ int fontrule_parse(LOGFONTA *lf, const char *str)
}

#define FONTRULE_MATCH(rule, dst, val) \
if(rule##->##val && rule##->##val != dst##->##val) {\
if(rule->val && rule->val != dst->val) {\
return 0; \
}

#define FONTRULE_APPLY(dst, rep, val) \
if(rep##->##val && priority ? 1 : !dst##->##val) { \
dst##->##val = rep##->##val; \
if(rep->val && priority ? 1 : !dst->val) { \
dst->val = rep->val; \
}

#define FONTRULE_MACRO_EXPAND(macro, p1, p2) \
Expand Down
2 changes: 1 addition & 1 deletion thcrap/src/zip.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Zipfile handling.
*/

#include <thcrap.h>
#include "thcrap.h"
#include <zlib.h>

/**
Expand Down
1 change: 0 additions & 1 deletion thcrap/thcrap.def
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
LIBRARY
EXPORTS
; Binary hacks
; -------------
Expand Down
2 changes: 1 addition & 1 deletion win32_utf8

0 comments on commit e518fc3

Please sign in to comment.