From 5e8d539f1f67a718645aa025e150b6982d7fd97e Mon Sep 17 00:00:00 2001 From: David Rose Date: Sat, 1 May 2010 16:10:54 +0000 Subject: [PATCH] move OS_SIMPLE_THREADS to dtool_config.h --- dtool/LocalSetup.pp | 4 ++++ panda/src/pipeline/Sources.pp | 2 -- panda/src/pipeline/contextSwitch.c | 1 - .../src/pipeline/contextSwitchParameters.h.pp | 18 ------------------ 4 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 panda/src/pipeline/contextSwitchParameters.h.pp diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp index d4b9958db2..aaf1531e8a 100644 --- a/dtool/LocalSetup.pp +++ b/dtool/LocalSetup.pp @@ -407,6 +407,10 @@ $[cdefine HAVE_THREADS] /* Define if we want to use fast, user-space simulated threads. */ $[cdefine SIMPLE_THREADS] +/* Define if SIMPLE_THREADS should be implemented with the OS-provided + threading layer (if available). */ +$[cdefine OS_SIMPLE_THREADS] + /* Define to enable deadlock detection, mutex recursion checks, etc. */ $[cdefine DEBUG_THREADS] diff --git a/panda/src/pipeline/Sources.pp b/panda/src/pipeline/Sources.pp index 40237bffbc..5f96dc3442 100644 --- a/panda/src/pipeline/Sources.pp +++ b/panda/src/pipeline/Sources.pp @@ -281,5 +281,3 @@ test_setjmp.cxx #end test_bin_target - -#include $[THISDIRPREFIX]contextSwitchParameters.h.pp diff --git a/panda/src/pipeline/contextSwitch.c b/panda/src/pipeline/contextSwitch.c index 8184499ffc..c4d32e2456 100644 --- a/panda/src/pipeline/contextSwitch.c +++ b/panda/src/pipeline/contextSwitch.c @@ -13,7 +13,6 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "contextSwitch.h" -#include "contextSwitchParameters.h" #include #include diff --git a/panda/src/pipeline/contextSwitchParameters.h.pp b/panda/src/pipeline/contextSwitchParameters.h.pp deleted file mode 100644 index 4c2bfb601d..0000000000 --- a/panda/src/pipeline/contextSwitchParameters.h.pp +++ /dev/null @@ -1,18 +0,0 @@ -// This file is read and processed by ppremake to generate -// contextSwitchParameters.h, which is #included by configPageManager.cxx. -// This mechanism is used, rather than just putting the parameters in -// dtool_config.h, to (a) help keep the prc encryption key from -// getting spread around to too many places, and (b) minimize the need -// to rebuild the whole world just because you changed some low-level -// prc parameters. - -#output contextSwitchParameters.h notouch -/* contextSwitchParameters.h. Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[notdir $[THISFILENAME]]. */ -/********************************** DO NOT EDIT ****************************/ - - -/* Define if SIMPLE_THREADS should be implemented with the OS-provided - threading layer (if available). */ -$[cdefine OS_SIMPLE_THREADS] - -#end contextSwitchParameters.h