aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-04-16 14:26:33 -0700
committerPaul Eggert2011-04-16 14:26:33 -0700
commit90efadd1f623e3b48cb594ef8caa709cd514d329 (patch)
tree777ba612b86028fbf4821968eda2e8a57cf36a31
parent3c647824ce968b3305848d2f49176d4dbecd3a19 (diff)
downloademacs-90efadd1f623e3b48cb594ef8caa709cd514d329.tar.gz
emacs-90efadd1f623e3b48cb594ef8caa709cd514d329.zip
* sysdep.c (_FILE_OFFSET_BITS): Make this hack even uglier
by pacifying GCC about it. Maybe it's time to retire it?
-rw-r--r--src/ChangeLog3
-rw-r--r--src/sysdep.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 329ec9400c7..de7d62e1005 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12011-04-16 Paul Eggert <eggert@cs.ucla.edu> 12011-04-16 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * sysdep.c (_FILE_OFFSET_BITS): Make this hack even uglier
4 by pacifying GCC about it. Maybe it's time to retire it?
5
3 * dispextern.h (struct redisplay_interface): Rename param 6 * dispextern.h (struct redisplay_interface): Rename param
4 to avoid shadowing. 7 to avoid shadowing.
5 8
diff --git a/src/sysdep.c b/src/sysdep.c
index e01bc4b1fbc..45e80ac0155 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2966,6 +2966,8 @@ system_process_attributes (Lisp_Object pid)
2966 2966
2967#if PROCFS_FILE_OFFSET_BITS_HACK == 1 2967#if PROCFS_FILE_OFFSET_BITS_HACK == 1
2968#define _FILE_OFFSET_BITS 64 2968#define _FILE_OFFSET_BITS 64
2969#ifdef _FILE_OFFSET_BITS /* Avoid unused-macro warnings. */
2970#endif
2969#endif /* PROCFS_FILE_OFFSET_BITS_HACK == 1 */ 2971#endif /* PROCFS_FILE_OFFSET_BITS_HACK == 1 */
2970 2972
2971Lisp_Object 2973Lisp_Object