diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2018-07-28 06:17:11 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2018-07-28 06:17:11 +0000 |
| commit | 34a4e7083686390fb4cb7c4af023349da4d2c8ec (patch) | |
| tree | 9585903f2b2b3bed4425521a4a42902bc52e551b /games/edge | |
| parent | d1c43be170598e45b3860a2b09c59faab3702286 (diff) | |
| download | ports-34a4e7083686390fb4cb7c4af023349da4d2c8ec.tar.gz ports-34a4e7083686390fb4cb7c4af023349da4d2c8ec.zip | |
games/edge: Fix build with Clang 6
deh_edge/english.h:35:63: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
#define LOADNET "you can't do load while in a net game!\n\n"PRESSKEY
^
http://beefy12.nyi.freebsd.org/data/head-amd64-default/p475044_s336572/logs/edge-1.35_9.log
Notes
Notes:
svn path=/head/; revision=475495
Diffstat (limited to 'games/edge')
| -rw-r--r-- | games/edge/files/patch-deh__edge_english.h | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/games/edge/files/patch-deh__edge_english.h b/games/edge/files/patch-deh__edge_english.h new file mode 100644 index 000000000000..71f1cc87ec2e --- /dev/null +++ b/games/edge/files/patch-deh__edge_english.h @@ -0,0 +1,61 @@ +deh_edge/english.h:35:63: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] +#define LOADNET "you can't do load while in a net game!\n\n"PRESSKEY + ^ + +--- deh_edge/english.h.orig 2018-07-28 06:12:45 UTC ++++ deh_edge/english.h +@@ -32,29 +32,29 @@ namespace Deh_Edge + #define PRESSKEY "press a key." + #define PRESSYN "press y or n." + #define QUITMSG "are you sure you want to\nquit this great game?" +-#define LOADNET "you can't do load while in a net game!\n\n"PRESSKEY +-#define QLOADNET "you can't quickload during a netgame!\n\n"PRESSKEY +-#define QSAVESPOT "you haven't picked a quicksave slot yet!\n\n"PRESSKEY +-#define SAVEDEAD "you can't save if you aren't playing!\n\n"PRESSKEY +-#define QSPROMPT "quicksave over your game named\n\n'%s'?\n\n"PRESSYN +-#define QLPROMPT "do you want to quickload the game named\n\n'%s'?\n\n"PRESSYN ++#define LOADNET "you can't do load while in a net game!\n\n" PRESSKEY ++#define QLOADNET "you can't quickload during a netgame!\n\n" PRESSKEY ++#define QSAVESPOT "you haven't picked a quicksave slot yet!\n\n" PRESSKEY ++#define SAVEDEAD "you can't save if you aren't playing!\n\n" PRESSKEY ++#define QSPROMPT "quicksave over your game named\n\n'%s'?\n\n" PRESSYN ++#define QLPROMPT "do you want to quickload the game named\n\n'%s'?\n\n" PRESSYN + + #define NEWGAME \ + "you can't start a new game\n"\ +-"while in a network game.\n\n"PRESSKEY ++"while in a network game.\n\n" PRESSKEY + + #define NIGHTMARE \ + "are you sure? this skill level\n"\ +-"isn't even remotely fair.\n\n"PRESSYN ++"isn't even remotely fair.\n\n" PRESSYN + + #define SWSTRING \ + "this is the shareware version of doom.\n\n"\ +-"you need to order the entire trilogy.\n\n"PRESSKEY ++"you need to order the entire trilogy.\n\n" PRESSKEY + + #define MSGOFF "Messages OFF" + #define MSGON "Messages ON" +-#define NETEND "you can't end a netgame!\n\n"PRESSKEY +-#define ENDGAME "are you sure you want to end the game?\n\n"PRESSYN ++#define NETEND "you can't end a netgame!\n\n" PRESSKEY ++#define ENDGAME "are you sure you want to end the game?\n\n" PRESSYN + + #define DOSY "(press y to quit)" + +@@ -726,11 +726,11 @@ namespace Deh_Edge + #define DETAILLO "Low detail" + + #define QUITMSG "are you sure you want to\nquit this great game?" +-#define QLOADNET "you can't quickload during a netgame!\n\n"PRESSKEY ++#define QLOADNET "you can't quickload during a netgame!\n\n" PRESSKEY + + #define SWSTRING \ + "this is the shareware version of doom.\n\n"\ +-"you need to order the entire trilogy.\n\n"PRESSKEY ++"you need to order the entire trilogy.\n\n" PRESSKEY + + } // Deh_Edge + |