summaryrefslogtreecommitdiff
path: root/VC++Files
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-10-14 11:45:20 +0300
committerunknown <monty@mysql.com>2005-10-14 11:45:20 +0300
commit800061bdb041d4c53fba4b88817dbeb78735d9cf (patch)
tree9ee5e00fa64e1c260da4c4627b6fc129003e30bd /VC++Files
parent92f80fbb86a9e4d1a0ccb06a84e8329a7506df0b (diff)
parent91afe31fe06e027fb4dd981b1953fc5b06a6b5e5 (diff)
downloadmariadb-git-800061bdb041d4c53fba4b88817dbeb78735d9cf.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'VC++Files')
-rw-r--r--VC++Files/test1/mysql_thr.c2
-rw-r--r--VC++Files/thr_test/thr_test.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/VC++Files/test1/mysql_thr.c b/VC++Files/test1/mysql_thr.c
index de1d936806e..a1ac09f2784 100644
--- a/VC++Files/test1/mysql_thr.c
+++ b/VC++Files/test1/mysql_thr.c
@@ -33,7 +33,7 @@ typedef CRITICAL_SECTION pthread_mutex_t;
#define pthread_mutex_lock(A) (EnterCriticalSection(A),0)
#define pthread_mutex_unlock(A) LeaveCriticalSection(A)
#define pthread_mutex_destroy(A) DeleteCriticalSection(A)
-#define pthread_handler_t unsigned __cdecl *
+#define pthread_handler_t unsigned __cdecl
typedef unsigned (__cdecl *pthread_handler)(void *);
#define pthread_self() GetCurrentThread()
diff --git a/VC++Files/thr_test/thr_test.c b/VC++Files/thr_test/thr_test.c
index 100fcb9c45e..efb9ea27ba7 100644
--- a/VC++Files/thr_test/thr_test.c
+++ b/VC++Files/thr_test/thr_test.c
@@ -44,7 +44,7 @@ typedef CRITICAL_SECTION pthread_mutex_t;
#define pthread_mutex_lock(A) (EnterCriticalSection(A),0)
#define pthread_mutex_unlock(A) LeaveCriticalSection(A)
#define pthread_mutex_destroy(A) DeleteCriticalSection(A)
-#define pthread_handler_t unsigned __cdecl *
+#define pthread_handler_t unsigned __cdecl
typedef unsigned (__cdecl *pthread_handler)(void *);
#define pthread_self() GetCurrentThread()