aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-04-16 14:28:14 -0700
committerPaul Eggert2011-04-16 14:28:14 -0700
commit875975e94dae06f2da4c1e0ad5bdc4cfd5b5f449 (patch)
treeae77bbcbfa0232fb226bf84df5076139a6b2efe3
parente264f2620be29b32f02b529847dfd6621ca4a7f9 (diff)
downloademacs-875975e94dae06f2da4c1e0ad5bdc4cfd5b5f449.tar.gz
emacs-875975e94dae06f2da4c1e0ad5bdc4cfd5b5f449.zip
* xfaces.c (USG, __TIMEVAL__): Likewise.
-rw-r--r--src/ChangeLog1
-rw-r--r--src/xfaces.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a11562b4d7a..ec43b7b2f72 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * sysdep.c (_FILE_OFFSET_BITS): Make this hack even uglier 3 * sysdep.c (_FILE_OFFSET_BITS): Make this hack even uglier
4 by pacifying GCC about it. Maybe it's time to retire it? 4 by pacifying GCC about it. Maybe it's time to retire it?
5 * xfaces.c (USG, __TIMEVAL__): Likewise.
5 6
6 * dispextern.h (struct redisplay_interface): Rename param 7 * dispextern.h (struct redisplay_interface): Rename param
7 to avoid shadowing. 8 to avoid shadowing.
diff --git a/src/xfaces.c b/src/xfaces.c
index 5cfe99d1285..fbed183522a 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -273,6 +273,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
273#include <X11/Xos.h> 273#include <X11/Xos.h>
274#define USG 274#define USG
275#define __TIMEVAL__ 275#define __TIMEVAL__
276#if defined USG || defined __TIMEVAL__ /* Don't warn about unused macros. */
277#endif
276#else /* not XOS_NEEDS_TIME_H */ 278#else /* not XOS_NEEDS_TIME_H */
277#include <X11/Xos.h> 279#include <X11/Xos.h>
278#endif /* not XOS_NEEDS_TIME_H */ 280#endif /* not XOS_NEEDS_TIME_H */