svn commit: r327207 - head/games/jigzo/files

[Dmitry Marakasov]

Author: amdmi3
Date: Sat Sep 14 01:16:20 2013
New Revision: 327207
URL: http://svnweb.freebsd.org/changeset/ports/327207

Log:
  Fix build with clang/libc++

Added:
  head/games/jigzo/files/patch-src-Loader.cxx   (contents, props changed)
  head/games/jigzo/files/patch-src-main.cxx   (contents, props changed)

Added: head/games/jigzo/files/patch-src-Loader.cxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/jigzo/files/patch-src-Loader.cxx	Sat Sep 14 01:16:20 2013	(r327207)
@@ -0,0 +1,10 @@
+--- src/Loader.cxx.orig	2013-09-14 02:26:08.849226279 +0400
++++ src/Loader.cxx	2013-09-14 02:26:47.256226887 +0400
+@@ -24,6 +24,7 @@
+ {
+ #include <png.h>
+ #include <jpeglib.h>
++#include <stdlib.h>
+ }
+ 
+ void JpgLoader::Load(const std::string& filename,RGB& target,int x,int y)

Added: head/games/jigzo/files/patch-src-main.cxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/jigzo/files/patch-src-main.cxx	Sat Sep 14 01:16:20 2013	(r327207)
@@ -0,0 +1,37 @@
+--- src/main.cxx.orig	2013-09-14 02:26:08.857226185 +0400
++++ src/main.cxx	2013-09-14 02:28:44.311226803 +0400
+@@ -56,6 +56,7 @@
+ #include <sys/types.h>
+ #endif
+ #include <dirent.h>
++#include <unistd.h> // for getpid()
+ 
+ #include "Screen.hxx"
+ #include "Sprite.hxx"
+@@ -1540,7 +1541,7 @@
+ 		int i;
+ 		Uint8 *keys = SDL_GetKeyState(&i);
+ 		SDL_Event event;
+-		while (mode!=end) {
++		while (mode!=::end) {
+ 			//static Uint32 mark = 0;
+ 			SDL_Delay(10);
+ 			while (SDL_PollEvent(&event)) {
+@@ -1579,7 +1580,7 @@
+ 				if (clickLeave)
+ 				{
+ 					if (mode == intro)
+-						FadeOutTo(end_intro,end);
++						FadeOutTo(end_intro,::end);
+ 					else if (mode == browse) {
+ 						FadeOutTo(end_browse,start_intro);
+ 					} else {
+@@ -1587,7 +1588,7 @@
+ 					}
+ 				}
+ 				if (event.type == SDL_QUIT) {
+-					mode = end;
++					mode = ::end;
+ 					break;
+ 				}
+ 			}