Attachment 153349 Details for Bug 197852 – pre-commit fixup, v2

[patch] pre-commit fixup, v2

fixup.diff (text/plain), 1.96 KB, created by Jan Beich on 2015-02-23 02:18:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-02-23 02:18:44 UTC

Size: 1.96 KB

patch

obsolete

>diff --git devel/ChipmunkPhysics/files/patch-include_chipmunk_chipmunk.h devel/ChipmunkPhysics/files/patch-include_chipmunk_chipmunk.h
>index 0d984ae..35758c9 100644
>--- devel/ChipmunkPhysics/files/patch-include_chipmunk_chipmunk.h
>+++ devel/ChipmunkPhysics/files/patch-include_chipmunk_chipmunk.h
>@@ -1,10 +1,11 @@
> --- include/chipmunk/chipmunk.h.orig	2015-01-13 01:54:11 UTC
> +++ include/chipmunk/chipmunk.h
>-@@ -32,6 +32,8 @@
>+@@ -32,6 +32,9 @@
>  #ifdef WIN32
>  	// For alloca().
>  	#include <malloc.h>
>-+#elif defined(__FreeBSD__)
>++#elif defined(__DragonFly__) || defined(__FreeBSD__) \
>++   || defined(__NetBSD__) || defined(__OpenBSD__) \
> +	/* already included in <stdlib.h> */
>  #else
>  	#include <alloca.h>
>diff --git devel/ChipmunkPhysics/files/patch-src_cpHastySpace.c devel/ChipmunkPhysics/files/patch-src_cpHastySpace.c
>new file mode 100644
>index 0000000..7ab878f
>--- /dev/null
>+++ devel/ChipmunkPhysics/files/patch-src_cpHastySpace.c
>@@ -0,0 +1,41 @@
>+--- src/cpHastySpace.c.orig	2015-01-13 01:54:11 UTC
>++++ src/cpHastySpace.c
>+@@ -5,8 +5,11 @@
>+ #include <stdio.h>
>+ 
>+ #include <pthread.h>
>+-//#include <sys/param.h >
>+-#include <sys/sysctl.h>
>++#ifdef _WIN32
>++#include <windows.h>
>++#else
>++#include <unistd.h>
>++#endif
>+ 
>+ #include "chipmunk/chipmunk_private.h"
>+ #include "chipmunk/cpHastySpace.h"
>+@@ -313,15 +316,18 @@ cpHastySpaceSetThreads(cpSpace *space, u
>+ 	
>+ 	cpHastySpace *hasty = (cpHastySpace *)space;
>+ 	HaltThreads(hasty);
>+-	
>+-#ifdef __APPLE__
>++
>+ 	if(threads == 0){
>+-		size_t size = sizeof(threads);
>+-		sysctlbyname("hw.ncpu", &threads, &size, NULL, 0);
>+-	}
>++#if defined(_SC_NPROCESSORS_CONF)
>++		threads = sysconf(_SC_NPROCESSORS_CONF);
>++#elif defined(_WIN32)
>++		SYSTEM_INFO siSysInfo;
>++		GetSystemInfo(&siSysInfo);
>++		threads = siSysInfo.dwNumberOfProcessors;
>+ #else
>+-	if(threads == 0) threads = 1;
>++		threads = 1;
>+ #endif
>++	}
>+ 	
>+ 	hasty->num_threads = (threads < MAX_THREADS ? threads : MAX_THREADS);
>+ 	hasty->num_working = hasty->num_threads - 1;

Flags:

jbeich: maintainer-approval? (ports)

Actions: View | Diff

Attachments on bug 197852: 153221 | 153308 | 153349