summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/config.in26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/config.in b/src/config.in
index 9a958563737..5ef32f7b261 100644
--- a/src/config.in
+++ b/src/config.in
@@ -124,6 +124,9 @@ Boston, MA 02111-1307, USA. */
/* Define to 1 if dynamic ptys are supported. */
#undef HAVE_DEV_PTMX
+/* Define to 1 if you have the `difftime' function. */
+#undef HAVE_DIFFTIME
+
/* Define to 1 if you have the `dup2' function. */
#undef HAVE_DUP2
@@ -1010,17 +1013,20 @@ typedef unsigned size_t;
# endif
#endif
+/* On Mac OS X, these macros are already defined in precompiled headers. */
+#ifndef MAC_OSX
/* avoid deprecated functions */
-#ifdef HAVE_MEMCPY
-# define bcopy(a,b,s) memcpy (b,a,s)
-#endif
-#ifdef HAVE_MEMSET
-# define bzero(a,s) memset (a,0,s)
-#endif
-#ifdef HAVE_MEMCMP
-# define BCMP memcmp
-# define bcmp memcmp
-#endif
+# ifdef HAVE_MEMCPY
+# define bcopy(a,b,s) memcpy (b,a,s)
+# endif
+# ifdef HAVE_MEMSET
+# define bzero(a,s) memset (a,0,s)
+# endif
+# ifdef HAVE_MEMCMP
+# define BCMP memcmp
+# define bcmp memcmp
+# endif
+#endif /* MAC_OSX */
#endif /* EMACS_CONFIG_H */