aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/conf_post.h7
-rw-r--r--src/regex-emacs.h7
2 files changed, 6 insertions, 8 deletions
diff --git a/src/conf_post.h b/src/conf_post.h
index 8d56f0b4905..97582984378 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -202,13 +202,6 @@ extern void _DebPrint (const char *fmt, ...);
202#endif 202#endif
203#endif 203#endif
204 204
205#ifdef emacs /* Don't do this for lib-src. */
206/* Tell regex-emacs.c to use a type compatible with Emacs. */
207#define RE_TRANSLATE_TYPE Lisp_Object
208#define RE_TRANSLATE(TBL, C) char_table_translate (TBL, C)
209#define RE_TRANSLATE_P(TBL) (!EQ (TBL, make_number (0)))
210#endif
211
212/* Tell time_rz.c to use Emacs's getter and setter for TZ. 205/* Tell time_rz.c to use Emacs's getter and setter for TZ.
213 Only Emacs uses time_rz so this is OK. */ 206 Only Emacs uses time_rz so this is OK. */
214#define getenv_TZ emacs_getenv_TZ 207#define getenv_TZ emacs_getenv_TZ
diff --git a/src/regex-emacs.h b/src/regex-emacs.h
index cb6dd76ed3e..9a6214af98c 100644
--- a/src/regex-emacs.h
+++ b/src/regex-emacs.h
@@ -219,7 +219,7 @@ extern ptrdiff_t emacs_re_safe_alloca;
219 ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG) \ 219 ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG) \
220 & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS)) 220 & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS))
221 221
222#define RE_SYNTAX_POSIX_AWK \ 222#define RE_SYNTAX_POSIX_AWK \
223 (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \ 223 (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \
224 | RE_INTERVALS | RE_NO_GNU_OPS) 224 | RE_INTERVALS | RE_NO_GNU_OPS)
225 225
@@ -350,6 +350,11 @@ typedef enum
350 REG_ESIZEBR /* n or m too big in \{n,m\} */ 350 REG_ESIZEBR /* n or m too big in \{n,m\} */
351} reg_errcode_t; 351} reg_errcode_t;
352 352
353/* Use a type compatible with Emacs. */
354#define RE_TRANSLATE_TYPE Lisp_Object
355#define RE_TRANSLATE(TBL, C) char_table_translate (TBL, C)
356#define RE_TRANSLATE_P(TBL) (!EQ (TBL, make_number (0)))
357
353/* This data structure represents a compiled pattern. Before calling 358/* This data structure represents a compiled pattern. Before calling
354 the pattern compiler, the fields `buffer', `allocated', `fastmap', 359 the pattern compiler, the fields `buffer', `allocated', `fastmap',
355 `translate', and `no_sub' can be set. After the pattern has been 360 `translate', and `no_sub' can be set. After the pattern has been