From owner-svn-ports-head@freebsd.org Wed Feb 1 05:27:07 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 16328CCD69D; Wed, 1 Feb 2017 05:27:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E52441005; Wed, 1 Feb 2017 05:27:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v115R69M087788; Wed, 1 Feb 2017 05:27:06 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v115R5S8087786; Wed, 1 Feb 2017 05:27:05 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201702010527.v115R5S8087786@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 1 Feb 2017 05:27:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432977 - in head/games/kajaani-kombat: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2017 05:27:07 -0000 Author: jbeich Date: Wed Feb 1 05:27:05 2017 New Revision: 432977 URL: https://svnweb.freebsd.org/changeset/ports/432977 Log: games/kajaani-kombat: unbreak with clang 4.0 client_net.cpp:34:12: error: ordered comparison between pointer and zero ('SDL_cond *' and 'int') if (cond <0) ~~~~ ^~ client_net.cpp:40:13: error: ordered comparison between pointer and zero ('SDL_mutex *' and 'int') if (mutex < 0) ~~~~~ ^ ~ client_net.cpp:48:16: error: ordered comparison between pointer and zero ('SDL_Thread *' and 'int') if (trans_th < 0) ~~~~~~~~ ^ ~ client_net.cpp:54:16: error: ordered comparison between pointer and zero ('SDL_Thread *' and 'int') if (input_th < 0) ~~~~~~~~ ^ ~ game_server.cpp:67:14: error: ordered comparison between pointer and zero ('SDL_Thread *' and 'int') if (con_th < 0) ~~~~~~ ^ ~ Reported by: antoine (via exp-run) Added: head/games/kajaani-kombat/files/patch-client__net.cpp (contents, props changed) head/games/kajaani-kombat/files/patch-game__server.cpp (contents, props changed) Modified: head/games/kajaani-kombat/Makefile (contents, props changed) Modified: head/games/kajaani-kombat/Makefile ============================================================================== --- head/games/kajaani-kombat/Makefile Wed Feb 1 05:26:51 2017 (r432976) +++ head/games/kajaani-kombat/Makefile Wed Feb 1 05:27:05 2017 (r432977) @@ -3,7 +3,7 @@ PORTNAME= kajaani-kombat PORTVERSION= 0.7 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://kombat.kajaani.net/dl/ Added: head/games/kajaani-kombat/files/patch-client__net.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/kajaani-kombat/files/patch-client__net.cpp Wed Feb 1 05:27:05 2017 (r432977) @@ -0,0 +1,34 @@ +--- client_net.cpp.orig 2005-01-22 16:51:34 UTC ++++ client_net.cpp +@@ -31,13 +31,13 @@ client_tcpnet::client_tcpnet(IPaddress * + assert (ret != -1); + + cond = SDL_CreateCond(); +- if (cond <0) ++ if (cond == NULL) + { + fprintf (stderr, "Error creating cond variable\n"); + exit(2); + } + mutex = SDL_CreateMutex(); +- if (mutex < 0) ++ if (mutex == NULL) + { + fprintf (stderr, "Error creating mutex\n"); + exit(2); +@@ -45,13 +45,13 @@ client_tcpnet::client_tcpnet(IPaddress * + + active = true; + trans_th = SDL_CreateThread (&client_tcpnet::transf_func, (void *) this); +- if (trans_th < 0) ++ if (trans_th == NULL) + { + fprintf(stderr, "Error starting thread: %s\n", SDL_GetError()); + exit(2); + } + input_th = SDL_CreateThread (&client_tcpnet::input_func, (void *) this); +- if (input_th < 0) ++ if (input_th == NULL) + { + fprintf(stderr, "Error starting thread: %s\n", SDL_GetError()); + exit(2); Added: head/games/kajaani-kombat/files/patch-game__server.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/kajaani-kombat/files/patch-game__server.cpp Wed Feb 1 05:27:05 2017 (r432977) @@ -0,0 +1,11 @@ +--- game_server.cpp.orig 2005-05-30 10:25:51 UTC ++++ game_server.cpp +@@ -64,7 +64,7 @@ void game_server::init_net() + + // OK, init server thread to listen to clients + con_th = SDL_CreateThread (&game_server::connection_accepter, (void *) this); +- if (con_th < 0) ++ if (con_th == NULL) + { + fprintf (stderr, "[SRV] Error starting thread: %s\n", SDL_GetError()); + exit(2);