diff options
| author | Eli Zaretskii | 2013-06-03 21:06:09 +0200 |
|---|---|---|
| committer | Michael Albinus | 2013-06-03 21:06:09 +0200 |
| commit | 7f203aa1fde2bc9ec43aa05a939525cdab149832 (patch) | |
| tree | 43e175dbe784faa04b4f3b284b1c62a89c26822a /nt | |
| parent | 55a87246bae97514b6e927b9401b2b79592b8b91 (diff) | |
| download | emacs-7f203aa1fde2bc9ec43aa05a939525cdab149832.tar.gz emacs-7f203aa1fde2bc9ec43aa05a939525cdab149832.zip | |
* configure.ac (HAVE_GFILENOTIFY): Do not change $LIBS.
(GFILENOTIFY_CFLAGS, GFILENOTIFY_LIBS): Substitute.
* nt/config.nt: Add HAVE_GFILENOTIFY, HAVE_W32NOTIFY and USE_FILE_NOTIFY.
* src/Makefile.in (GFILENOTIFY_CFLAGS, GFILENOTIFY_LIBS): New variables.
(ALL_CFLAGS): Add $(GFILENOTIFY_CFLAGS).
(LIBES): Add $(GFILENOTIFY_LIBS).
* src/w32inevt.c (handle_file_notifications): Add dummy implementation
for !HAVE_W32NOTIFY.
* src/w32term.c: Wrap code with HAVE_W32NOTIFY.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/config.nt | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index b5322f51030..41f6d81d592 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2013-06-03 Eli Zaretskii <eliz@gnu.org> | 1 | 2013-06-03 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * config.nt: Add HAVE_GFILENOTIFY, HAVE_W32NOTIFY and USE_FILE_NOTIFY. | ||
| 4 | |||
| 5 | 2013-06-03 Eli Zaretskii <eliz@gnu.org> | ||
| 6 | |||
| 3 | * inc/sys/time.h (struct timeval): Remove the _W64 guards. | 7 | * inc/sys/time.h (struct timeval): Remove the _W64 guards. |
| 4 | 8 | ||
| 5 | 2013-06-01 Eli Zaretskii <eliz@gnu.org> | 9 | 2013-06-01 Eli Zaretskii <eliz@gnu.org> |
diff --git a/nt/config.nt b/nt/config.nt index 4380f2b86c5..95b56f2dc64 100644 --- a/nt/config.nt +++ b/nt/config.nt | |||
| @@ -547,6 +547,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 547 | /* Define to 1 if you have the `gettimeofday' function. */ | 547 | /* Define to 1 if you have the `gettimeofday' function. */ |
| 548 | #define HAVE_GETTIMEOFDAY 1 | 548 | #define HAVE_GETTIMEOFDAY 1 |
| 549 | 549 | ||
| 550 | /* Define to 1 if using GFile. */ | ||
| 551 | #undef HAVE_GFILENOTIFY | ||
| 552 | |||
| 550 | /* Define to 1 if you have the `get_current_dir_name' function. */ | 553 | /* Define to 1 if you have the `get_current_dir_name' function. */ |
| 551 | #undef HAVE_GET_CURRENT_DIR_NAME | 554 | #undef HAVE_GET_CURRENT_DIR_NAME |
| 552 | 555 | ||
| @@ -1141,6 +1144,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1141 | /* Define to 1 if you have the <vfork.h> header file. */ | 1144 | /* Define to 1 if you have the <vfork.h> header file. */ |
| 1142 | #undef HAVE_VFORK_H | 1145 | #undef HAVE_VFORK_H |
| 1143 | 1146 | ||
| 1147 | /* Define to 1 to use w32notify. */ | ||
| 1148 | #define HAVE_W32NOTIFY 1 | ||
| 1149 | |||
| 1144 | /* Define to 1 if you have the <wchar.h> header file. */ | 1150 | /* Define to 1 if you have the <wchar.h> header file. */ |
| 1145 | #undef HAVE_WCHAR_H | 1151 | #undef HAVE_WCHAR_H |
| 1146 | 1152 | ||
| @@ -1497,6 +1503,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1497 | /* Define to nonzero if you want access control list support. */ | 1503 | /* Define to nonzero if you want access control list support. */ |
| 1498 | #undef USE_ACL | 1504 | #undef USE_ACL |
| 1499 | 1505 | ||
| 1506 | /* Define to 1 if using file notifications. */ | ||
| 1507 | #define USE_FILE_NOTIFY 1 | ||
| 1508 | |||
| 1500 | /* Define to 1 if using GTK. */ | 1509 | /* Define to 1 if using GTK. */ |
| 1501 | #undef USE_GTK | 1510 | #undef USE_GTK |
| 1502 | 1511 | ||