aboutsummaryrefslogtreecommitdiffstats
path: root/src/m/ia64.h
diff options
context:
space:
mode:
authorStefan Monnier2010-12-10 19:13:08 -0500
committerStefan Monnier2010-12-10 19:13:08 -0500
commit2c302df3a13236bfbf8ea1b771d13618fcda8d71 (patch)
treef26dc9f22861dc37610de319d05255de058c221b /src/m/ia64.h
parent0c747cb143fa227e78f350ac353d703f489209df (diff)
parent175069efeb080517afefdd44a06f7a779ea8c25c (diff)
downloademacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.tar.gz
emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.zip
Merge from trunk
Diffstat (limited to 'src/m/ia64.h')
-rw-r--r--src/m/ia64.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/m/ia64.h b/src/m/ia64.h
index bbf09ac878b..e9cf07b6789 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -31,13 +31,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
31#define EMACS_INT long 31#define EMACS_INT long
32#define EMACS_UINT unsigned long 32#define EMACS_UINT unsigned long
33 33
34/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
35 the 24-bit bit field into an int. In other words, if bit fields
36 are always unsigned.
37
38 This flag only matters if you use USE_LISP_UNION_TYPE. */
39#define EXPLICIT_SIGN_EXTEND
40
41/* Data type of load average, as read out of kmem. */ 34/* Data type of load average, as read out of kmem. */
42#define LOAD_AVE_TYPE long 35#define LOAD_AVE_TYPE long
43 36