* systime.h (Time): Define only if emacs is defined.

This is to allow ../lib-src/profile.c to be compiled on FreeBSD,
where the include path doesn't have X11/X.h by default.  See
<http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00561.html>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 989ecce9d2a1353e0eacd9a3084a059c6b84663f..eed82fc865b6c4ed38adfaf8378d99cafc49ddb4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * systime.h (Time): Define only if emacs is defined.
+       This is to allow ../lib-src/profile.c to be compiled on FreeBSD,
+       where the include path doesn't have X11/X.h by default.  See
+       <http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00561.html>.
+
 2011-05-20 Kenichi Handa  <handa@m17n.org>
 
        * composite.c (find_automatic_composition): Fix previous change.

diff --git a/src/systime.h b/src/systime.h
index db43b26dc5e53c0190b5d10ce7d5e2c8ceef1470..bed9ed4aa7178374d74d575864d9e37b2af9cc91 100644 (file)
--- a/src/systime.h
+++ b/src/systime.h
@@ -30,10 +30,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 #endif
 
-#ifdef HAVE_X_WINDOWS
-# include <X11/X.h>
-#else
+#ifdef emacs
+# ifdef HAVE_X_WINDOWS
+#  include <X11/X.h>
+# else
 typedef unsigned long Time;
+# endif
 #endif
 
 #ifdef HAVE_TZNAME