diff options
| author | Juanma Barranquero | 2012-08-01 13:20:07 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2012-08-01 13:20:07 +0200 |
| commit | c90acc54da9534fd083fc63887202f5d2ec13029 (patch) | |
| tree | a5a1497185b8f4cce9e15765b451d29c88a17041 /src | |
| parent | 069bac5e5b55c0f63bd2764e727108d2b48b2643 (diff) | |
| download | emacs-c90acc54da9534fd083fc63887202f5d2ec13029.tar.gz emacs-c90acc54da9534fd083fc63887202f5d2ec13029.zip | |
Sync Windows port with autogen/config.in changes.
* nt/config.nt: Sync with autogen/config.in.
(DEVICE_SEP, FLOAT_CHECK_DOMAIN, HAVE_INVERSE_HYPERBOLIC)
(INTERNAL_TERMINAL, IS_ANY_SEP, IS_DEVICE_SEP, IS_DIRECTORY_SEP):
New macros.
* src/s/ms-w32.h (DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP):
Remove; moved to nt/config.nt.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/s/ms-w32.h | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a6913d1ad78..97e4d71baab 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-08-01 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * s/ms-w32.h (DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP): | ||
| 4 | Remove; moved to nt/config.nt. | ||
| 5 | |||
| 1 | 2012-08-01 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2012-08-01 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | Use INTERNAL_FIELD for conses and overlays. | 8 | Use INTERNAL_FIELD for conses and overlays. |
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index ca4c1001ec9..8c02a8b8a66 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h | |||
| @@ -74,13 +74,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 74 | your system and must be used only through an encapsulation (which | 74 | your system and must be used only through an encapsulation (which |
| 75 | you should place, by convention, in sysdep.c). */ | 75 | you should place, by convention, in sysdep.c). */ |
| 76 | 76 | ||
| 77 | /* Define this to be the separator between devices and paths. */ | ||
| 78 | #define DEVICE_SEP ':' | ||
| 79 | |||
| 80 | /* We'll support either convention on NT. */ | ||
| 81 | #define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\') | ||
| 82 | #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_)) | ||
| 83 | |||
| 84 | #ifdef __GNUC__ | 77 | #ifdef __GNUC__ |
| 85 | #ifndef __cplusplus | 78 | #ifndef __cplusplus |
| 86 | #undef inline | 79 | #undef inline |