diff options
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/include/my_global.h b/include/my_global.h index e2b59dc220f..0b423655281 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -56,6 +56,12 @@ #include <config-win.h> #elif defined(OS2) #include <config-os2.h> +#elif defined(__NETWARE__) +#include <my_config.h> +#include <config-netware.h> +#if defined(__cplusplus) && defined(inline) +#undef inline /* fix configure problem */ +#endif #else #include <my_config.h> #if defined(__cplusplus) && defined(inline) @@ -447,17 +453,20 @@ typedef SOCKET_SIZE_TYPE size_socket; /* file create flags */ -#ifndef O_SHARE +#ifndef O_SHARE /* Probably not windows */ #define O_SHARE 0 /* Flag to my_open for shared files */ #ifndef O_BINARY #define O_BINARY 0 /* Flag to my_open for binary files */ #endif -#define FILE_BINARY 0 /* Flag to my_fopen for binary streams */ +#ifndef FILE_BINARY +#define FILE_BINARY O_BINARY /* Flag to my_fopen for binary streams */ +#endif #ifdef HAVE_FCNTL #define HAVE_FCNTL_LOCK #define F_TO_EOF 0L /* Param to lockf() to lock rest of file */ #endif #endif /* O_SHARE */ + #ifndef O_TEMPORARY #define O_TEMPORARY 0 #endif @@ -800,10 +809,9 @@ typedef char bool; /* Ordinary boolean values 0 1 */ #define MY_HOW_OFTEN_TO_ALARM 2 /* How often we want info on screen */ #define MY_HOW_OFTEN_TO_WRITE 1000 /* How often we want info on screen */ +#ifndef set_timespec #ifdef HAVE_TIMESPEC_TS_SEC #define set_timespec(ABSTIME,SEC) { (ABSTIME).ts_sec=time(0) + (time_t) (SEC); (ABSTIME).ts_nsec=0; } -#elif defined(__WIN__) -#define set_timespec(ABSTIME,SEC) { (ABSTIME).tv_sec=time((time_t*)0) + (time_t) (SEC); (ABSTIME).tv_nsec=0; } #else #define set_timespec(ABSTIME,SEC) \ {\ @@ -812,7 +820,8 @@ typedef char bool; /* Ordinary boolean values 0 1 */ (ABSTIME).tv_sec=tv.tv_sec+(time_t) (SEC);\ (ABSTIME).tv_nsec=tv.tv_usec*1000;\ } -#endif +#endif /* HAVE_TIMESPEC_TS_SEC */ +#endif /* set_timespec */ /* Define-funktions for reading and storing in machine independent format |