summaryrefslogtreecommitdiff
path: root/include/my_time.h
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2008-04-03 11:32:00 -0400
committercmiller@zippy.cornsilk.net <>2008-04-03 11:32:00 -0400
commit9ff7a0cedca7b92b5c16f282e52e83460a6d7092 (patch)
treec831693e16e1a99024c7a4ae4fe1d84087150eca /include/my_time.h
parent3bff5b59c669fa14645fb4705b2406bd2ba0e120 (diff)
downloadmariadb-git-9ff7a0cedca7b92b5c16f282e52e83460a6d7092.tar.gz
Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3
When linking with some external programs, "multiple definition of `init_time'" Rename init_time() to my_init_time() to avoid collision with other libraries (particularly libmng).
Diffstat (limited to 'include/my_time.h')
-rw-r--r--include/my_time.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_time.h b/include/my_time.h
index 99eb5c36c6b..014327d6fd8 100644
--- a/include/my_time.h
+++ b/include/my_time.h
@@ -94,7 +94,7 @@ long calc_daynr(uint year,uint month,uint day);
uint calc_days_in_year(uint year);
uint year_2000_handling(uint year);
-void init_time(void);
+void my_init_time(void);
/*