generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

version: init moved to private name space, added protos

Browse Source 
follow-up to 80015cdd52145
This commit is contained in:
Daniel Stenberg 2016-03-17 00:55:46 +01:00
parent 5f5b626357
commit 8d9d03a157
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/easy.c
View File

@ -79,7 +79,7 @@
#include "curl_memory.h" #include "curl_memory.h"
#include "memdebug.h" #include "memdebug.h"
void curl_version_init(); void Curl_version_init(void);
/* win32_cleanup() is for win32 socket cleanup functionality, the opposite /* win32_cleanup() is for win32 socket cleanup functionality, the opposite
of win32_init() */ of win32_init() */
@ -284,7 +284,7 @@ static CURLcode global_init(long flags, bool memoryfuncs)
init_flags = flags; init_flags = flags;
curl_version_init(); Curl_version_init();
return CURLE_OK; return CURLE_OK;
} }

6
lib/version.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -64,9 +64,11 @@
#define CURL_LIBSSH2_VERSION LIBSSH2_VERSION #define CURL_LIBSSH2_VERSION LIBSSH2_VERSION
#endif #endif
void Curl_version_init(void);
/* For thread safety purposes this function is called by global_init so that /* For thread safety purposes this function is called by global_init so that
the static data in both version functions is initialized. */ the static data in both version functions is initialized. */
void curl_version_init() void Curl_version_init(void)
{ {
curl_version(); curl_version();
curl_version_info(CURLVERSION_NOW); curl_version_info(CURLVERSION_NOW);