comparison src/m/ia64.h @ 109859:68616bb3ae25

merged from trunk
author Joakim <joakim@localhost.localdomain>
date Mon, 14 Jun 2010 11:48:51 +0200
parents 4e8dcb0d6fe0
children fb5779a6cf4b
comparison
equal deleted inserted replaced
109858:73108272ef0b 109859:68616bb3ae25
46 #define LOAD_AVE_TYPE long 46 #define LOAD_AVE_TYPE long
47 47
48 /* Convert that into an integer that is 100 for a load average of 1.0 */ 48 /* Convert that into an integer that is 100 for a load average of 1.0 */
49 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) 49 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
50 50
51 #ifdef __ELF__
52 #undef UNEXEC
53 #define UNEXEC unexelf.o
54 #endif
55
56 #ifndef NOT_C_CODE
57
58 #ifdef REL_ALLOC 51 #ifdef REL_ALLOC
59 #ifndef _MALLOC_INTERNAL 52 #ifndef _MALLOC_INTERNAL
60 /* "char *" because ralloc.c defines it that way. gmalloc.c thinks it 53 /* "char *" because ralloc.c defines it that way. gmalloc.c thinks it
61 is allowed to prototype these as "void *" so we don't prototype in 54 is allowed to prototype these as "void *" so we don't prototype in
62 that case. You're right: it stinks! */ 55 that case. You're right: it stinks! */
63 extern char *r_alloc (), *r_re_alloc (); 56 extern char *r_alloc (), *r_re_alloc ();
64 extern void r_alloc_free (); 57 extern void r_alloc_free ();
65 #endif /* not _MALLOC_INTERNAL */ 58 #endif /* not _MALLOC_INTERNAL */
66 #endif /* REL_ALLOC */ 59 #endif /* REL_ALLOC */
67 60
68 #endif /* not NOT_C_CODE */
69
70 #define HAVE_TEXT_START 61 #define HAVE_TEXT_START
71 62
72 /* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66 63 /* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66
73 (do not change this comment) */ 64 (do not change this comment) */