1--- /SourceCache/emacs/emacs-90/emacs/src/regex.c	2007-01-20 20:18:15.000000000 -0800
2+++ src/regex.c	2013-01-03 21:20:48.000000000 -0800
3@@ -38,7 +38,7 @@
4 # include <config.h>
5 #endif
6 
7-#if defined STDC_HEADERS && !defined emacs
8+#if defined STDC_HEADERS
9 # include <stddef.h>
10 #else
11 /* We need this for `regex.h', and perhaps for the Emacs include files.  */
12@@ -1863,7 +1863,7 @@ static int analyse_first _RE_ARGS ((re_c
13     /* If the buffer moved, move all the pointers into it.  */		\
14     if (old_buffer != bufp->buffer)					\
15       {									\
16-	int incr = bufp->buffer - old_buffer;				\
17+	ptrdiff_t incr = bufp->buffer - old_buffer;			\
18 	MOVE_BUFFER_POINTER (b);					\
19 	MOVE_BUFFER_POINTER (begalt);					\
20 	if (fixup_alt_jump)						\
21