diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-07-04 18:24:40 +0200 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-07-04 18:24:40 +0200 |
commit | 9701759b3d9ea9fd9bee640ce27171bdd51b7e78 (patch) | |
tree | 88ad4445989ffb68b1f3af82642749ca50372ab9 /include/my_pthread.h | |
parent | d46576b35ac0775e6500ee15e828f29c74998262 (diff) | |
download | mariadb-git-9701759b3d9ea9fd9bee640ce27171bdd51b7e78.tar.gz |
MDEV-23043 Refactor Windows service handling
Removed the existing nt_service classes - they provide little
abstraction, and only obscure a relatively simple service handling.
This replaces by similar code inspired by MS docs samples.
Service handling is now moved into winmain.cc, which contains
the main() function for Windows.
winmain provides reporting callbacks, which should be used by external code
,to report transitions from starting to running to shutting down to stopped.
Removed a do-nothing ServiceMain thread, and the
non-working service "pause/continue". Removed a lot of #ifdef __WIN__
code from mysqld.cc
Diffstat (limited to 'include/my_pthread.h')
-rw-r--r-- | include/my_pthread.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 4888bfcc2c8..8137bca570b 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -104,7 +104,6 @@ int pthread_cancel(pthread_t thread); #define ETIMEDOUT 145 /* Win32 doesn't have this */ #endif -#define getpid() GetCurrentThreadId() #define HAVE_LOCALTIME_R 1 #define _REENTRANT 1 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 |