72c46a20eb
General difference (for ports infrastructure): - switch to cmake build system - drop external lua and use internal patched version - set SEPARATE_BUILD=flavored to avoid extracting a lot of data for every arch - removed superfluous dependency to devel/sdl - drop tinygui FLAVOR Full changelog is here: http://svn.gna.org/viewcvs/*checkout*/wesnoth/tags/1.10.0/changelog OKs from jasper@ (maintainer), aja@, pascal@, cmake-wise OK from dcoppa@ Positive feedback from Antti Harri and Bryan Linton via ports@
14 lines
455 B
Plaintext
14 lines
455 B
Plaintext
$OpenBSD: patch-src_multiplayer_create_cpp,v 1.2 2012/04/07 08:32:32 kirby Exp $
|
|
--- src/multiplayer_create.cpp.orig Sat Jan 7 06:35:17 2012
|
|
+++ src/multiplayer_create.cpp Mon Feb 13 17:17:39 2012
|
|
@@ -40,6 +40,9 @@
|
|
#include "wml_separators.hpp"
|
|
#include "formula_string_utils.hpp"
|
|
|
|
+/* Resolve conflict with nitems() macro from sys/param.h */
|
|
+#undef nitems
|
|
+
|
|
static lg::log_domain log_config("config");
|
|
#define ERR_CF LOG_STREAM(err, log_config)
|
|
|