diff options
author | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2016-05-20 20:28:29 +0000 |
---|---|---|
committer | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2016-05-20 20:28:29 +0000 |
commit | 05d922f34468b5955f6f4aef006f411c3185fa70 (patch) | |
tree | 1d868f5c30ae961b7c6852f5769530bdf9c6895d /games/trackballs | |
parent | d8a8e3e66a0a05d0c7df66c1a97114164ec1c75a (diff) | |
download | ports-05d922f34468b5955f6f4aef006f411c3185fa70.tar.gz ports-05d922f34468b5955f6f4aef006f411c3185fa70.zip |
Fix build with libc++ 3.8.0 by removing conflicting re-definition of abs().
PR: 209612
Submitted by: dim
Notes
Notes:
svn path=/head/; revision=415575
Diffstat (limited to 'games/trackballs')
-rw-r--r-- | games/trackballs/files/patch-src_glHelp.cc | 10 | ||||
-rw-r--r-- | games/trackballs/files/patch-src_menuMode.cc | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/games/trackballs/files/patch-src_glHelp.cc b/games/trackballs/files/patch-src_glHelp.cc new file mode 100644 index 000000000000..16ced301272b --- /dev/null +++ b/games/trackballs/files/patch-src_glHelp.cc @@ -0,0 +1,10 @@ +--- src/glHelp.cc.orig 2007-04-07 13:15:09 UTC ++++ src/glHelp.cc +@@ -129,7 +129,6 @@ void drawSurface(SDL_Surface *surface,in + // why is this removed? should it not be done??? + glDeleteTextures(1,&texture); + } +-inline Real abs(Real v) {return v>0.0?v:-v;} + double mousePointerPhase=0.0; + + void tickMouse(Real td) { diff --git a/games/trackballs/files/patch-src_menuMode.cc b/games/trackballs/files/patch-src_menuMode.cc new file mode 100644 index 000000000000..80354fa6f77b --- /dev/null +++ b/games/trackballs/files/patch-src_menuMode.cc @@ -0,0 +1,10 @@ +--- src/menuMode.cc.orig 2007-04-07 13:16:26 UTC ++++ src/menuMode.cc +@@ -163,7 +163,6 @@ void MenuMode::doSelection() { + case MENU_EDITOR: GameMode::activate(EditMode::editMode); break; + } + } +-inline Real abs(Real v) {return v>0.0?v:-v;} + + void MenuMode::idle(Real td) { + int w,h,i,x,y; |