fix Gracket low-level pref, and fix schthread.h for Darwin (and OS X without -DOS_X)
This commit is contained in:
parent
ccef8f8f37
commit
250ae872a7
|
@ -2767,7 +2767,7 @@ int wxGetPreference(const char *name, char *res, long len)
|
|||
# ifdef wx_mac
|
||||
home = scheme_expand_user_filename("~/Library/Preferences/", -1, NULL, NULL, 0);
|
||||
# else
|
||||
home = scheme_expand_user_filename("~/.plt-scheme/", -1, NULL, NULL, 0);
|
||||
home = scheme_expand_user_filename("~/.racket/", -1, NULL, NULL, 0);
|
||||
# endif
|
||||
|
||||
l = strlen(home);
|
||||
|
|
|
@ -30,7 +30,7 @@ extern "C" {
|
|||
# if _MSC_VER
|
||||
# define THREAD_LOCAL /* empty */
|
||||
# define IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS
|
||||
# elif defined(OS_X) || defined(GC2_PLACES_TESTING)
|
||||
# elif (defined(__APPLE__) && defined(__MACH__)) || defined(GC2_PLACES_TESTING)
|
||||
# define IMPLEMENT_THREAD_LOCAL_VIA_PTHREADS
|
||||
# if defined(__x86_64__) || defined(__i386__)
|
||||
# define INLINE_GETSPECIFIC_ASSEMBLY_CODE
|
||||
|
@ -300,7 +300,7 @@ START_XFORM_SKIP;
|
|||
static inline Thread_Local_Variables *scheme_get_thread_local_variables() __attribute__((used));
|
||||
static inline Thread_Local_Variables *scheme_get_thread_local_variables() {
|
||||
Thread_Local_Variables *x = NULL;
|
||||
# if defined(OS_X)
|
||||
# if defined(__APPLE__) && defined(__MACH__)
|
||||
# if defined(__x86_64__)
|
||||
asm volatile("movq %%gs:0x60(,%1,8), %0" : "=r"(x) : "r"(scheme_thread_local_key));
|
||||
# else
|
||||
|
|
Loading…
Reference in New Issue
Block a user