diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-09-30 03:39:37 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-09-30 03:39:37 +0200 |
| commit | 46d04ebdefe05377b86e851d73df22c069d63246 (patch) | |
| tree | abeea5fd6b9b99995ec6b277906b6ddbacc5752a /sql/udf_example.c | |
| parent | e6090f10bb581e8f16f8ecb676a27e184548ef24 (diff) | |
| download | mariadb-git-46d04ebdefe05377b86e851d73df22c069d63246.tar.gz | |
Backport of the patch
http://lists.mysql.com/commits/57725
Vladislav Vaintroub 2008-11-03
Cleanup CMakeLists.txt(s) - remove winsock2 (ws2_32) from
TARGET_LINK_LIBRARIES.
Every exe or dll linked with mysys needs ws2_32, because
mysys uses winsock function WSAStartup in my_init().
However, there is no need to explicitely add ws2_32 to
the list of TARGET_LINK_LIBRARIES multiple times.
Visual Studio comes with a handy pragma that tells linker
to add library. So patch replaces bunch of ws2_32 in
CMakeLists with single pragma comment(lib,"ws2_32")
in my_init.c
Additionally, reference to non-existing "debug" library
has been removed from TARGET_LINK_LIBRARIES. The correct
name of the library is "dbug".
Diffstat (limited to 'sql/udf_example.c')
| -rw-r--r-- | sql/udf_example.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/udf_example.c b/sql/udf_example.c index 30d85d95034..1d6a9828594 100644 --- a/sql/udf_example.c +++ b/sql/udf_example.c @@ -138,6 +138,11 @@ typedef long long longlong; #endif #include <mysql.h> #include <ctype.h> +
+#ifdef _WIN32
+/* inet_aton needs winsock library */
+#pragma comment(lib, "ws2_32")
+#endif
static pthread_mutex_t LOCK_hostname; |