diff options
| author | unknown <reggie@mdk10.(none)> | 2005-02-23 22:55:46 -0600 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-02-23 22:55:46 -0600 |
| commit | 5064f263546c5928b142e3f36c6b24f63c0f4da2 (patch) | |
| tree | cd1bfdbf7f227ea03ebe9dba639ccafb1edf86ef /sql/my_decimal.h | |
| parent | fc79380e6953a86d88eeeb6ec2e05e133a7f1be5 (diff) | |
| download | mariadb-git-5064f263546c5928b142e3f36c6b24f63c0f4da2.tar.gz | |
More changes to make 5.0.3 compile on Windows
sql_map.cc:
moved include of sys/stat outside of HAVE_SYS_MMAN_H define
my_decimal.h:
Added define for EMBEDDED_SERVER for call to string2my_decimal
mi_packrec.c:
removed cast to caddr_t
myisam/mi_packrec.c:
removed cast to caddr_t
sql/my_decimal.h:
Added define for EMBEDDED_SERVER for call to string2my_decimal
sql/sql_map.cc:
moved include of sys/stat outside of HAVE_SYS_MMAN_H define
Diffstat (limited to 'sql/my_decimal.h')
| -rw-r--r-- | sql/my_decimal.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/my_decimal.h b/sql/my_decimal.h index b3d6b6ccde6..c02b0cb4c8b 100644 --- a/sql/my_decimal.h +++ b/sql/my_decimal.h @@ -244,8 +244,7 @@ int str2my_decimal(uint mask, const char *str, my_decimal *d, char **end) int str2my_decimal(uint mask, const char *from, uint length, CHARSET_INFO *charset, my_decimal *decimal_value); - -#ifdef MYSQL_SERVER +#if defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY) inline int string2my_decimal(uint mask, const String *str, my_decimal *d) { @@ -253,7 +252,6 @@ int string2my_decimal(uint mask, const String *str, my_decimal *d) } #endif - inline int double2my_decimal(uint mask, double val, my_decimal *d) { |