diff options
| author | Juanma Barranquero | 2006-11-03 16:24:53 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2006-11-03 16:24:53 +0000 |
| commit | 5796dab79d3da052f4916a2c37d20c32775184f0 (patch) | |
| tree | c7d25bea67f1f7b536e43603346771fed5c732b9 /lib-src | |
| parent | b6ce9c466c56b8486418730875d57b1e165a7581 (diff) | |
| download | emacs-5796dab79d3da052f4916a2c37d20c32775184f0.tar.gz emacs-5796dab79d3da052f4916a2c37d20c32775184f0.zip | |
(initialize_sockets): Don't initialize Winsock more than once.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/emacsclient.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index bede01aaa0b..af7c10cac7d 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c | |||
| @@ -390,8 +390,11 @@ void __cdecl close_winsock () | |||
| 390 | 390 | ||
| 391 | void initialize_sockets () | 391 | void initialize_sockets () |
| 392 | { | 392 | { |
| 393 | static done = FALSE; | ||
| 393 | WSADATA wsaData; | 394 | WSADATA wsaData; |
| 394 | 395 | ||
| 396 | if (done) return; | ||
| 397 | |||
| 395 | /* Initialize the WinSock2 library. */ | 398 | /* Initialize the WinSock2 library. */ |
| 396 | if (WSAStartup (MAKEWORD (2, 0), &wsaData)) | 399 | if (WSAStartup (MAKEWORD (2, 0), &wsaData)) |
| 397 | { | 400 | { |
| @@ -400,6 +403,7 @@ void initialize_sockets () | |||
| 400 | } | 403 | } |
| 401 | 404 | ||
| 402 | atexit (close_winsock); | 405 | atexit (close_winsock); |
| 406 | done = TRUE; | ||
| 403 | } | 407 | } |
| 404 | #endif /* WINDOWSNT */ | 408 | #endif /* WINDOWSNT */ |
| 405 | 409 | ||