diff options
| author | unknown <kent@mysql.com> | 2006-04-29 15:58:02 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-04-29 15:58:02 +0200 |
| commit | 7c8f4d4e68878805ca59306f779a3426f780faa2 (patch) | |
| tree | d1ade37258dd65251563b8e8811ae6dbb7e18d9a /include | |
| parent | c76ebcd1bfa7de38a0f08e6c349f9486046bfb35 (diff) | |
| download | mariadb-git-7c8f4d4e68878805ca59306f779a3426f780faa2.tar.gz | |
config-win.h:
Fix strange "double" define for popen.
Avoid warnings about sprintf() etc. being unsafe.
Corrected typo "#endfif"
include/config-win.h:
Fix strange "double" define for popen.
Avoid warnings about sprintf() etc. being unsafe.
Corrected typo "#endfif"
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/config-win.h b/include/config-win.h index 03f130ad37e..bb54a43b8bb 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -22,6 +22,11 @@ functions */ #define _WIN32_WINNT 0x0500 #endif +#if defined(_MSC_VER) && _MSC_VER >= 1400 +/* Avoid endless warnings about sprintf() etc. being unsafe. */ +#define _CRT_SECURE_NO_DEPRECATE 1 +#endif + #include <sys/locking.h> #include <windows.h> #include <math.h> /* Because of rint() */ @@ -195,7 +200,7 @@ typedef uint rf_SetTimer; #define my_sigset(A,B) signal((A),(B)) #define finite(A) _finite(A) #define sleep(A) Sleep((A)*1000) -#define popen(A) popen(A,B) _popen((A),(B)) +#define popen(A,B) _popen((A),(B)) #define pclose(A) _pclose(A) #ifndef __BORLANDC__ @@ -385,7 +390,7 @@ inline double ulonglong2double(ulonglong value) #else #define MYSQL_DEFAULT_CHARSET_NAME "latin1" #define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci" -#enfif +#endif #define HAVE_SPATIAL 1 #define HAVE_RTREE_KEYS 1 |