projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add mappings for Big5 code points.
[chise/xemacs-chise.git-]
/
src
/
mem-limits.h
diff --git
a/src/mem-limits.h
b/src/mem-limits.h
index
f3d7226
..
fb6f16b
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>
@@
-38,10
+38,6
@@
Boston, MA 02111-1307, USA. */
#include <ulimit.h>
#endif
#include <ulimit.h>
#endif
-#ifdef MSDOS
-#include <dpmi.h>
-#endif
-
/* Some systems need this before <sys/resource.h>. */
#include <sys/types.h>
/* Some systems need this before <sys/resource.h>. */
#include <sys/types.h>
@@
-70,16
+66,14
@@
extern int etext, __data_start; weak_symbol (__data_start)
#ifndef BSD4_2
#ifndef USG
#ifndef BSD4_2
#ifndef USG
-#ifndef MSDOS
-#ifndef WINDOWSNT
-#ifndef __CYGWIN32__
+#ifndef WIN32_NATIVE
+#ifndef CYGWIN
#if defined(__linux__) && defined(powerpc) /*Added Kaoru Fukui*/
#else /*Added Kaoru Fukui*/
#include <sys/vlimit.h>
#endif /*Added by Fukui*/
#if defined(__linux__) && defined(powerpc) /*Added Kaoru Fukui*/
#else /*Added Kaoru Fukui*/
#include <sys/vlimit.h>
#endif /*Added by Fukui*/
-#endif /* not __CYGWIN32__ */
-#endif /* not WINDOWSNT */
-#endif /* not MSDOS */
+#endif /* not CYGWIN */
+#endif /* not WIN32_NATIVE */
#endif /* not USG */
#else /* if BSD4_2 */
#include <sys/time.h>
#endif /* not USG */
#else /* if BSD4_2 */
#include <sys/time.h>
@@
-96,24
+90,17
@@
typedef void *POINTER;
typedef char *POINTER;
#endif
typedef char *POINTER;
#endif
-#ifndef __CYGWIN32__
+#ifndef CYGWIN
typedef unsigned long SIZE;
#endif
extern POINTER start_of_data (void);
typedef unsigned long SIZE;
#endif
extern POINTER start_of_data (void);
-#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
+#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
+117,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
@@
-176,7
+163,7
@@
get_lim_data (void)
}
#else /* not USG */
}
#else /* not USG */
-#if defined( WINDOWSNT )
+#if defined( WIN32_NATIVE )
static void
get_lim_data (void)
static void
get_lim_data (void)
@@
-188,22
+175,11
@@
get_lim_data (void)
#else
#if !defined (BSD4_2) && !defined (__osf__)
#else
#if !defined (BSD4_2) && !defined (__osf__)
-#ifdef MSDOS
-void
-get_lim_data (void)
-{
- _go32_dpmi_meminfo info;
-
- _go32_dpmi_get_free_memory_information (&info);
- lim_data = info.available_memory;
-}
-#else /* not MSDOS */
static void
get_lim_data (void)
{
lim_data = vlimit (LIM_DATA, -1);
}
static void
get_lim_data (void)
{
lim_data = vlimit (LIM_DATA, -1);
}
-#endif /* not MSDOS */
#else /* BSD4_2 */
#else /* BSD4_2 */
@@
-220,9
+196,9
@@
get_lim_data (void)
#endif
}
#endif /* BSD4_2 */
#endif
}
#endif /* BSD4_2 */
-#endif /* not WINDOWSNT */
+#endif /* not WIN32_NATIVE */
#endif /* not USG */
#endif /* not NO_LIM_DATA */
#endif /* not HEAP_IN_DATA */
#endif /* not USG */
#endif /* not NO_LIM_DATA */
#endif /* not HEAP_IN_DATA */
-#endif /* _XEMACS_MEM_LIMITS_H_ */
+#endif /* INCLUDED_mem_limits_h_ */