diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 4 | ||||
| -rw-r--r-- | include/config-os2.h | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index f3685b51cd3..393dac3fd82 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -18,11 +18,11 @@ BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h \ mysqld_error.h my_list.h \ - my_pthread.h my_no_pthread.h raid.h errmsg.h \ + my_pthread.h my_no_pthread.h raid.h errmsg.h \ my_global.h my_net.h \ sslopt-case.h sslopt-longopts.h sslopt-usage.h \ sslopt-vars.h $(BUILT_SOURCES) -noinst_HEADERS = global.h config-win.h \ +noinst_HEADERS = global.h config-win.h config-os2.h\ nisam.h heap.h merge.h my_bitmap.h\ myisam.h myisampack.h myisammrg.h ft_global.h\ my_dir.h mysys_err.h my_base.h \ diff --git a/include/config-os2.h b/include/config-os2.h index 9064cd5a5bb..e23f4eb75e8 100644 --- a/include/config-os2.h +++ b/include/config-os2.h @@ -26,6 +26,7 @@ #include <os2.h> #include <math.h> #include <io.h> +#include <types.h> /* Define to name of system eg solaris*/ #define SYSTEM_TYPE "IBM OS/2 Warp" @@ -55,6 +56,8 @@ #define FILE_BINARY O_BINARY /* my_fopen in binary mode */ #define S_IROTH S_IREAD /* for my_lib */ +#define CANT_DELETE_OPEN_FILES /* saves open files in a list, for delayed delete */ + #define O_NONBLOCK 0x10 #define NO_OPEN_3 /* For my_create() */ @@ -84,7 +87,7 @@ #define F_WRLCK 2 /* Write lock. */ #define F_UNLCK 0 /* Remove lock. */ -#define S_IFMT 0xF000 /* Mask for file type */ +#define S_IFMT 0x17000 /* Mask for file type */ #define F_TO_EOF 0L /* Param to lockf() to lock rest of file */ #define HUGE_PTR @@ -268,7 +271,7 @@ typedef unsigned long long os_off_t; /* #undef HAVE_NONPOSIX_PTHREAD_MUTEX_INIT */ /* READLINE: */ -#define HAVE_POSIX_SIGNALS 1 +#define HAVE_POSIX_SIGNALS 0 /* sigwait with one argument */ /* #undef HAVE_NONPOSIX_SIGWAIT */ |