Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
411b80a5
Commit
411b80a5
authored
Oct 31, 2006
by
Juanma Barranquero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[WINDOWSNT]: Include <malloc.h> and <stdlib.h>.
(close_winsock): Declare as __cdecl.
parent
95d0feaa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
8 deletions
+19
-8
lib-src/ChangeLog
lib-src/ChangeLog
+5
-0
lib-src/emacsclient.c
lib-src/emacsclient.c
+14
-8
No files found.
lib-src/ChangeLog
View file @
411b80a5
2006-10-31 ,bS(Bscar Fuentes <ofv@wanadoo.es> (tiny change)
* emacsclient.c [WINDOWSNT]: Include <malloc.h> and <stdlib.h>.
(close_winsock): Declare as __cdecl.
2006-10-31 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* emacsclient.c [!WINDOWSNT]: Include <fcntl.h> if available.
...
...
lib-src/emacsclient.c
View file @
411b80a5
...
...
@@ -27,29 +27,35 @@ Boston, MA 02110-1301, USA. */
#endif
#ifdef WINDOWSNT
#define HAVE_SOCKETS
#define NO_SOCKETS_IN_FILE_SYSTEM
#endif
#ifdef WINDOWSNT
# include <malloc.h>
# include <stdlib.h>
# define HAVE_SOCKETS
# define NO_SOCKETS_IN_FILE_SYSTEM
# define HSOCKET SOCKET
# define CLOSE_SOCKET closesocket
# define IOCTL ioctlsocket
# define INITIALIZE() (initialize_sockets ())
typedef
unsigned
long
IOCTL_BOOL_ARG
;
#else
#else
/* !WINDOWSNT */
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
# include <netinet/in.h>
# include <sys/ioctl.h>
# define INVALID_SOCKET -1
# define HSOCKET int
# define CLOSE_SOCKET close
# define IOCTL ioctl
# define INITIALIZE()
typedef
int
IOCTL_BOOL_ARG
;
#endif
#endif
/* !WINDOWSNT */
#undef signal
...
...
@@ -379,7 +385,7 @@ quote_file_name (s, name)
#ifdef WINDOWSNT
/* Wrapper to make WSACleanup a cdecl, as required by atexit(). */
void
close_winsock
()
void
__cdecl
close_winsock
()
{
WSACleanup
();
}
...
...
@@ -497,7 +503,7 @@ set_tcp_socket ()
#else
IOCTL
(
s
,
FIONBIO
,
&
c_arg
);
#endif
#endif
#endif
setsockopt
(
s
,
SOL_SOCKET
,
SO_LINGER
,
(
char
*
)
&
l_arg
,
sizeof
l_arg
);
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment