HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use ptrdiff_t for specpdl counts
[bpt/emacs.git]
/
src
/
cygw32.c
diff --git
a/src/cygw32.c
b/src/cygw32.c
index
bbc3a49
..
59844c4
100644
(file)
--- a/
src/cygw32.c
+++ b/
src/cygw32.c
@@
-1,5
+1,5
@@
/* Cygwin support routines.
/* Cygwin support routines.
- Copyright (C) 2011-201
3
Free Software Foundation, Inc.
+ Copyright (C) 2011-201
4
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-23,12
+23,11
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <unistd.h>
#include <fcntl.h>
#include <unistd.h>
#include <fcntl.h>
-static
Lisp_Object
-fchdir_unwind (
Lisp_Objec
t dir_fd)
+static
void
+fchdir_unwind (
in
t dir_fd)
{
{
- (void) fchdir (XFASTINT (dir_fd));
- (void) close (XFASTINT (dir_fd));
- return Qnil;
+ (void) fchdir (dir_fd);
+ (void) close (dir_fd);
}
static void
}
static void
@@
-40,7
+39,7
@@
chdir_to_default_directory ()
if (old_cwd_fd == -1)
error ("could not open current directory: %s", strerror (errno));
if (old_cwd_fd == -1)
error ("could not open current directory: %s", strerror (errno));
- record_unwind_protect
(fchdir_unwind, make_number (old_cwd_fd)
);
+ record_unwind_protect
_int (fchdir_unwind, old_cwd_fd
);
new_cwd = Funhandled_file_name_directory (
Fexpand_file_name (build_string ("."), Qnil));
new_cwd = Funhandled_file_name_directory (
Fexpand_file_name (build_string ("."), Qnil));
@@
-57,7
+56,7
@@
conv_filename_to_w32_unicode (Lisp_Object in, int absolute_p)
ssize_t converted_len;
Lisp_Object converted;
unsigned flags;
ssize_t converted_len;
Lisp_Object converted;
unsigned flags;
-
in
t count = SPECPDL_INDEX ();
+
ptrdiff_
t count = SPECPDL_INDEX ();
chdir_to_default_directory ();
chdir_to_default_directory ();
@@
-86,7
+85,7
@@
conv_filename_from_w32_unicode (const wchar_t* in, int absolute_p)
ssize_t converted_len;
Lisp_Object converted;
unsigned flags;
ssize_t converted_len;
Lisp_Object converted;
unsigned flags;
-
in
t count = SPECPDL_INDEX ();
+
ptrdiff_
t count = SPECPDL_INDEX ();
chdir_to_default_directory ();
chdir_to_default_directory ();
@@
-135,6
+134,5
@@
For the reverse operation, see `cygwin-convert-file-name-to-windows'. */)
void
syms_of_cygw32 (void)
{
void
syms_of_cygw32 (void)
{
- defsubr (&Scygwin_convert_file_name_from_windows);
- defsubr (&Scygwin_convert_file_name_to_windows);
+#include "cygw32.x"
}
}