suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Gracket low-level pref, and fix schthread.h for Darwin (and OS X without -DOS_X)

Browse Source
This commit is contained in:
Matthew Flatt 2010-05-04 06:48:04 -06:00
parent ccef8f8f37
commit 250ae872a7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gracket/wxs/wxscheme.cxx
View File

@ -2767,7 +2767,7 @@ int wxGetPreference(const char *name, char *res, long len)
# ifdef wx_mac # ifdef wx_mac
home = scheme_expand_user_filename("~/Library/Preferences/", -1, NULL, NULL, 0); home = scheme_expand_user_filename("~/Library/Preferences/", -1, NULL, NULL, 0);
# else # else
home = scheme_expand_user_filename("~/.plt-scheme/", -1, NULL, NULL, 0); home = scheme_expand_user_filename("~/.racket/", -1, NULL, NULL, 0);
# endif # endif
l = strlen(home); l = strlen(home);

4
src/racket/include/schthread.h
View File

@ -30,7 +30,7 @@ extern "C" {
# if _MSC_VER # if _MSC_VER
# define THREAD_LOCAL /* empty */ # define THREAD_LOCAL /* empty */
# define IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS # 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 # define IMPLEMENT_THREAD_LOCAL_VIA_PTHREADS
# if defined(__x86_64__) || defined(__i386__) # if defined(__x86_64__) || defined(__i386__)
# define INLINE_GETSPECIFIC_ASSEMBLY_CODE # 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() __attribute__((used));
static inline Thread_Local_Variables *scheme_get_thread_local_variables() { static inline Thread_Local_Variables *scheme_get_thread_local_variables() {
Thread_Local_Variables *x = NULL; Thread_Local_Variables *x = NULL;
# if defined(OS_X) # if defined(__APPLE__) && defined(__MACH__)
# if defined(__x86_64__) # if defined(__x86_64__)
asm volatile("movq %%gs:0x60(,%1,8), %0" : "=r"(x) : "r"(scheme_thread_local_key)); asm volatile("movq %%gs:0x60(,%1,8), %0" : "=r"(x) : "r"(scheme_thread_local_key));
# else # else