diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-02-21 17:34:51 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-02-21 17:34:51 -0500 |
| commit | f619ad4ca2ce943d53589469c010e451afab97dd (patch) | |
| tree | e1b71f79518372ecab4c677ae948504450d8bf5d /src/lisp.h | |
| parent | a647cb26b695a542e3a546104afdf4c7c47eb061 (diff) | |
| parent | 9f8370e63f65f76887b319ab6a0368d4a332777c (diff) | |
| download | emacs-f619ad4ca2ce943d53589469c010e451afab97dd.tar.gz emacs-f619ad4ca2ce943d53589469c010e451afab97dd.tar.bz2 emacs-f619ad4ca2ce943d53589469c010e451afab97dd.zip | |
Merge from trunk
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/lisp.h b/src/lisp.h index 0e7eeebc9da..badeb4258fb 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1908,7 +1908,7 @@ extern void defvar_kboard (struct Lisp_Kboard_Objfwd *, const char *, int); #define DEFVAR_BUFFER_DEFAULTS(lname, vname, doc) \ do { \ static struct Lisp_Objfwd o_fwd; \ - defvar_lisp_nopro (&o_fwd, lname, &buffer_defaults.vname); \ + defvar_lisp_nopro (&o_fwd, lname, &BVAR (&buffer_defaults, vname)); \ } while (0) #define DEFVAR_KBOARD(lname, vname, doc) \ @@ -1916,7 +1916,7 @@ extern void defvar_kboard (struct Lisp_Kboard_Objfwd *, const char *, int); static struct Lisp_Kboard_Objfwd ko_fwd; \ defvar_kboard (&ko_fwd, \ lname, \ - (int)((char *)(¤t_kboard->vname) \ + (int)((char *)(¤t_kboard->vname ## _) \ - (char *)current_kboard)); \ } while (0) @@ -2073,11 +2073,11 @@ extern Lisp_Object case_temp2; /* Current buffer's map from characters to lower-case characters. */ -#define DOWNCASE_TABLE current_buffer->downcase_table +#define DOWNCASE_TABLE BVAR (current_buffer, downcase_table) /* Current buffer's map from characters to upper-case characters. */ -#define UPCASE_TABLE current_buffer->upcase_table +#define UPCASE_TABLE BVAR (current_buffer, upcase_table) /* Downcase a character, or make no change if that cannot be done. */ @@ -2171,6 +2171,11 @@ struct gcpro #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE #endif +/* Whether we do the stack marking manually. */ +#define BYTE_MARK_STACK !(GC_MARK_STACK == GC_MAKE_GCPROS_NOOPS \ + || GC_MARK_STACK == GC_MARK_STACK_CHECK_GCPROS) + + #if GC_MARK_STACK == GC_MAKE_GCPROS_NOOPS /* Do something silly with gcproN vars just so gcc shuts up. */ @@ -3282,7 +3287,9 @@ extern Lisp_Object Qbytecode; EXFUN (Fbyte_code, MANY); extern void syms_of_bytecode (void); extern struct byte_stack *byte_stack_list; +#ifdef BYTE_MARK_STACK extern void mark_byte_stack (void); +#endif extern void unmark_byte_stack (void); extern Lisp_Object exec_byte_code (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, int, Lisp_Object *); @@ -3438,11 +3445,6 @@ EXFUN (Fclear_face_cache, 1); EXFUN (Fx_load_color_file, 1); extern void syms_of_xfaces (void); -#ifndef HAVE_GETLOADAVG -/* Defined in getloadavg.c */ -extern int getloadavg (double *, int); -#endif - #ifdef HAVE_X_WINDOWS /* Defined in xfns.c */ extern void syms_of_xfns (void); |