diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-10-14 16:32:27 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-10-14 16:32:27 +0200 |
| commit | 220d91b834f7f7252b9953460422151b86b3520c (patch) | |
| tree | 8f3e16983e83ac0da6beef346cb05cd2591a7f83 /src/w32.c | |
| parent | 31e96eecc09283b5169faf0d5dc1c8efd58539ac (diff) | |
| parent | 9d4f32e88a1b642070f0adb41df04a0846c31970 (diff) | |
| download | emacs-220d91b834f7f7252b9953460422151b86b3520c.tar.gz | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/w32.c')
| -rw-r--r-- | src/w32.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/w32.c b/src/w32.c index 4ccda449b47..ae34ac6aadb 100644 --- a/src/w32.c +++ b/src/w32.c @@ -2970,7 +2970,7 @@ convert_time (FILETIME ft) if (!init) { - initialize_utc_base(); + initialize_utc_base (); init = 1; } @@ -5037,7 +5037,7 @@ fcntl (int s, int cmd, int options) unsigned long nblock = 1; int rc = pfn_ioctlsocket (SOCK_HANDLE (s), FIONBIO, &nblock); if (rc == SOCKET_ERROR) - set_errno(); + set_errno (); /* Keep track of the fact that we set this to non-blocking. */ fd_info[s].flags |= FILE_NDELAY; return rc; @@ -5935,8 +5935,7 @@ serial_open (char *port) /* For serial-process-configure */ void -serial_configure (struct Lisp_Process *p, - Lisp_Object contact) +serial_configure (struct Lisp_Process *p, Lisp_Object contact) { Lisp_Object childp2 = Qnil; Lisp_Object tem = Qnil; |