projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(find_charsets_in_charc_string): New prototype; delete
[chise/xemacs-chise.git-]
/
src
/
mem-limits.h
diff --git
a/src/mem-limits.h
b/src/mem-limits.h
index
8dd2c49
..
a7625d0
100644
(file)
--- a/
src/mem-limits.h
+++ b/
src/mem-limits.h
@@
-27,8
+27,8
@@
Boston, MA 02111-1307, USA. */
getrlimit() should be preferred to ulimit().
On Linux, ulimit() is deprecated and always returns -1. */
getrlimit() should be preferred to ulimit().
On Linux, ulimit() is deprecated and always returns -1. */
-#ifndef _XEMACS_MEM_LIMITS_H_
-#define _XEMACS_MEM_LIMITS_H_
+#ifndef INCLUDED_mem_limits_h_
+#define INCLUDED_mem_limits_h_
#ifdef HAVE_CONFIG_H
#include <config.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
@@
-100,20
+100,13
@@
typedef char *POINTER;
typedef unsigned long SIZE;
#endif
typedef unsigned long SIZE;
#endif
-extern POINTER start_of_data ();
-#ifdef DATA_SEG_BITS
-#define EXCEEDS_LISP_PTR(ptr) \
- (((EMACS_UINT) (ptr) & ~DATA_SEG_BITS) >> VALBITS)
-#else
-#define EXCEEDS_LISP_PTR(ptr) ((EMACS_UINT) (ptr) >> VALBITS)
-#endif
+extern POINTER start_of_data (void);
+#define EXCEEDS_LISP_PTR(ptr) 0
#ifdef BSD
#ifdef BSD
-#ifndef DATA_SEG_BITS
extern int etext;
#define start_of_data() &etext
#endif
extern int etext;
#define start_of_data() &etext
#endif
-#endif
#else /* not emacs */
extern char etext;
#else /* not emacs */
extern char etext;
@@
-130,7
+123,7
@@
static POINTER data_space_start;
/* Number of bytes of writable memory we can expect to be able to get */
extern unsigned int lim_data;
/* Number of bytes of writable memory we can expect to be able to get */
extern unsigned int lim_data;
-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)
extern unsigned long static_heap_size;
extern int initialized;
static void
extern unsigned long static_heap_size;
extern int initialized;
static void
@@
-225,4
+218,4
@@
get_lim_data (void)
#endif /* not NO_LIM_DATA */
#endif /* not HEAP_IN_DATA */
#endif /* not NO_LIM_DATA */
#endif /* not HEAP_IN_DATA */
-#endif /* _XEMACS_MEM_LIMITS_H_ */
+#endif /* INCLUDED_mem_limits_h_ */