diff options
| author | Geoff Voelker <voelker@cs.washington.edu> | 1995-11-07 07:57:46 +0000 |
|---|---|---|
| committer | Geoff Voelker <voelker@cs.washington.edu> | 1995-11-07 07:57:46 +0000 |
| commit | bdfab656b802988778c1d3ec8df002cb6eec0346 (patch) | |
| tree | d7cb28af8024f8f8abc73e1c827471792a4dd2d3 /nt | |
| parent | 0492cf29a875ef32a2a81f5bd9783bf903fd6d65 (diff) | |
| download | emacs-bdfab656b802988778c1d3ec8df002cb6eec0346.tar.gz | |
Update to latest src/config.in.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/config.nt | 30 | ||||
| -rw-r--r-- | nt/config.w95 | 30 |
2 files changed, 60 insertions, 0 deletions
diff --git a/nt/config.nt b/nt/config.nt index 377fc6f935b..8bf6a51fc1a 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -69,6 +69,7 @@ and this notice must be preserved on all copies. */ /* If we're using any sort of window system, define some consequences. */ #ifdef HAVE_X_WINDOWS +#define HAVE_WINDOW_SYSTEM #define MULTI_KBOARD #define HAVE_FACES #define HAVE_MOUSE @@ -118,11 +119,13 @@ and this notice must be preserved on all copies. */ #undef TIME_WITH_SYS_TIME #undef HAVE_LIBDNET +#undef HAVE_LIBPTHREADS #undef HAVE_LIBRESOLV #undef HAVE_ALLOCA_H #undef HAVE_GETTIMEOFDAY +#undef GETTIMEOFDAY_ONE_ARGUMENT #undef HAVE_GETHOSTNAME #undef HAVE_DUP2 #undef HAVE_RENAME @@ -291,6 +294,11 @@ typedef unsigned long EMACS_UINT; #define SIGTYPE RETSIGTYPE #endif +#ifdef emacs /* Don't do this for lib-src. */ +/* Tell regex.c to use a type compatible with Emacs. */ +#define RE_TRANSLATE_TYPE Lisp_Object * +#endif + /* The rest of the code currently tests the CPP symbol BSTRING. Override any claims made by the system-description files. Note that on some SCO version it is possible to have bcopy and not bcmp. */ @@ -317,3 +325,25 @@ extern char *getenv (); #endif #endif /* EMACS_CONFIG_H */ + +/* These default definitions are good for almost all machines. + The exceptions override them in m/*.h. */ + +#ifndef BITS_PER_CHAR +#define BITS_PER_CHAR 8 +#endif + +#ifndef BITS_PER_SHORT +#define BITS_PER_SHORT 16 +#endif + +/* Note that lisp.h uses this in a preprocessor conditional, so it + would not work to use sizeof. That being so, we do all of them + without sizeof, for uniformity's sake. */ +#ifndef BITS_PER_INT +#define BITS_PER_INT 32 +#endif + +#ifndef BITS_PER_LONG +#define BITS_PER_LONG 32 +#endif diff --git a/nt/config.w95 b/nt/config.w95 index f8cc8a75426..284772776cb 100644 --- a/nt/config.w95 +++ b/nt/config.w95 @@ -69,6 +69,7 @@ and this notice must be preserved on all copies. */ /* If we're using any sort of window system, define some consequences. */ #ifdef HAVE_X_WINDOWS +#define HAVE_WINDOW_SYSTEM #define MULTI_KBOARD #define HAVE_FACES #define HAVE_MOUSE @@ -118,11 +119,13 @@ and this notice must be preserved on all copies. */ #undef TIME_WITH_SYS_TIME #undef HAVE_LIBDNET +#undef HAVE_LIBPTHREADS #undef HAVE_LIBRESOLV #undef HAVE_ALLOCA_H #undef HAVE_GETTIMEOFDAY +#undef GETTIMEOFDAY_ONE_ARGUMENT #undef HAVE_GETHOSTNAME #undef HAVE_DUP2 #undef HAVE_RENAME @@ -291,6 +294,11 @@ typedef unsigned long EMACS_UINT; #define SIGTYPE RETSIGTYPE #endif +#ifdef emacs /* Don't do this for lib-src. */ +/* Tell regex.c to use a type compatible with Emacs. */ +#define RE_TRANSLATE_TYPE Lisp_Object * +#endif + /* The rest of the code currently tests the CPP symbol BSTRING. Override any claims made by the system-description files. Note that on some SCO version it is possible to have bcopy and not bcmp. */ @@ -317,3 +325,25 @@ extern char *getenv (); #endif #endif /* EMACS_CONFIG_H */ + +/* These default definitions are good for almost all machines. + The exceptions override them in m/*.h. */ + +#ifndef BITS_PER_CHAR +#define BITS_PER_CHAR 8 +#endif + +#ifndef BITS_PER_SHORT +#define BITS_PER_SHORT 16 +#endif + +/* Note that lisp.h uses this in a preprocessor conditional, so it + would not work to use sizeof. That being so, we do all of them + without sizeof, for uniformity's sake. */ +#ifndef BITS_PER_INT +#define BITS_PER_INT 32 +#endif + +#ifndef BITS_PER_LONG +#define BITS_PER_LONG 32 +#endif |