diff options
| author | Miles Bader | 2006-11-21 08:56:38 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-11-21 08:56:38 +0000 |
| commit | eeb7eaa88482114822730380196f4e7a3c0870dd (patch) | |
| tree | e8c3861b628ad53c6b8f158b74d1be8bd8590aeb /src/s | |
| parent | b15d6f4265b10fbc413caca03246feff9c87d53e (diff) | |
| parent | a98d0b8e8948293de119c4cdd7a8c79318ad82fa (diff) | |
| download | emacs-eeb7eaa88482114822730380196f4e7a3c0870dd.tar.gz emacs-eeb7eaa88482114822730380196f4e7a3c0870dd.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 505-522)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: etc/TUTORIAL.cn: Updated.
- Merge from erc--emacs--22
* gnus--rel--5.10 (patch 164-167)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-137
Diffstat (limited to 'src/s')
| -rw-r--r-- | src/s/gnu-linux.h | 2 | ||||
| -rw-r--r-- | src/s/ms-w32.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 55d9a725293..7116d24c718 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -377,7 +377,7 @@ Boston, MA 02110-1301, USA. */ | |||
| 377 | extern void *__libc_ia64_register_backing_store_base; \ | 377 | extern void *__libc_ia64_register_backing_store_base; \ |
| 378 | __builtin_ia64_flushrs (); \ | 378 | __builtin_ia64_flushrs (); \ |
| 379 | mark_memory (__libc_ia64_register_backing_store_base, \ | 379 | mark_memory (__libc_ia64_register_backing_store_base, \ |
| 380 | __builtin_ia64_bsp ()); \ | 380 | __builtin_ia64_bsp (), 0); \ |
| 381 | } while (0) | 381 | } while (0) |
| 382 | #endif | 382 | #endif |
| 383 | #endif | 383 | #endif |
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index fa4ca565171..461df7acfba 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h | |||
| @@ -279,7 +279,7 @@ Boston, MA 02110-1301, USA. */ | |||
| 279 | #define HAVE_STRFTIME 1 | 279 | #define HAVE_STRFTIME 1 |
| 280 | 280 | ||
| 281 | #define LOCALTIME_CACHE | 281 | #define LOCALTIME_CACHE |
| 282 | #undef HAVE_INET_SOCKETS | 282 | #define HAVE_INET_SOCKETS 1 |
| 283 | 283 | ||
| 284 | #undef HAVE_AIX_SMT_EXP | 284 | #undef HAVE_AIX_SMT_EXP |
| 285 | 285 | ||