X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fs%2Fmingw32.h;h=3e56d9ebbfbad915539e8571326f6dc3a4b8b5cd;hb=de379e10065c9231f9e5461dbcec457a1db1d5d6;hp=9cb42bfe964ec526226c94e3ab216fa710a90d5e;hpb=2fd9701a4f902054649dde9143a3f77809afee8f;p=chise%2Fxemacs-chise.git diff --git a/src/s/mingw32.h b/src/s/mingw32.h index 9cb42bf..3e56d9e 100644 --- a/src/s/mingw32.h +++ b/src/s/mingw32.h @@ -20,25 +20,20 @@ Boston, MA 02111-1307, USA. */ /* based on cygwin32.h by Andy Piper */ -#ifndef WINDOWSNT -#define WINDOWSNT +/* Identify ourselves */ +#ifndef WIN32_NATIVE +#define WIN32_NATIVE #endif -#ifndef DOS_NT -#define DOS_NT /* MSDOS or WINDOWSNT */ -#endif - -#ifdef HAVE_MS_WINDOWS -#define HAVE_NTGUI -#define HAVE_FACES -#endif +#define MINGW #ifndef ORDINARY_LINK #define ORDINARY_LINK #endif -#define C_SWITCH_SYSTEM "-mno-cygwin -Wno-sign-compare -fno-caller-saves -Int/inc -I../nt/inc -DWINDOWSNT" -#define LIBS_SYSTEM "-mno-cygwin -lwinmm -lwsock32" +#define C_SWITCH_SYSTEM "-mno-cygwin -Wno-sign-compare -fno-caller-saves -DWIN32_NATIVE" +#define LIBS_SYSTEM "-mno-cygwin -mwindows -lwinmm -lwsock32" +#define WIN32_LEAN_AND_MEAN #define TEXT_START -1 #define TEXT_END -1 @@ -51,44 +46,9 @@ Boston, MA 02111-1307, USA. */ #define LOCALE_USE_CP_ACP 0x40000000 #define NSIG 23 -#ifndef SPI_GETWHEELSCROLLLINES -#define SPI_GETWHEELSCROLLLINES 104 -#endif -#ifndef WHEEL_PAGESCROLL -#define WHEEL_PAGESCROLL (UINT_MAX) -#endif -#ifndef WHEEL_DELTA -#define WHEEL_DELTA 120 -#endif - /* this is necessary to get the TCS_* definitions in */ #define _WIN32_IE 0x0400 -#ifndef WM_MOUSEWHEEL -#define WM_MOUSEWHEEL 0x20A -#endif -#ifndef TCS_BOTTOM -#define TCS_BOTTOM 0x0002 -#endif -#ifndef TCS_VERTICAL -#define TCS_VERTICAL 0x0080 -#endif -#ifndef PHYSICALWIDTH -#define PHYSICALWIDTH 110 -#endif -#ifndef PHYSICALHEIGHT -#define PHYSICALHEIGHT 111 -#endif -#ifndef PHYSICALOFFSETX -#define PHYSICALOFFSETX 112 -#endif -#ifndef PHYSICALOFFSETY -#define PHYSICALOFFSETY 113 -#endif -#ifndef PBS_SMOOTH -#define PBS_SMOOTH 0x01 -#endif - /* translate NT world unexec stuff to our a.out definitions */ #define strnicmp strncasecmp @@ -96,30 +56,20 @@ Boston, MA 02111-1307, USA. */ #define HAVE_SOCKETS /* #endif */ #define OBJECTS_SYSTEM ntplay.o nt.o ntheap.o ntproc.o dired-msw.o -#define HAVE_NATIVE_SOUND #undef MAIL_USE_SYSTEM_LOCK -#define MAIL_USE_POP #define HAVE_MSW_C_DIRED -/* Define NO_ARG_ARRAY if you cannot take the address of the first of a - * group of arguments and treat it as an array of the arguments. */ - -#define NO_ARG_ARRAY - /* System calls that are encapsulated */ #define ENCAPSULATE_RENAME #define ENCAPSULATE_OPEN #define ENCAPSULATE_FOPEN #define ENCAPSULATE_MKDIR +#define ENCAPSULATE_STAT +#define ENCAPSULATE_FSTAT -/* Data type of load average, as read out of kmem. */ - -#define LOAD_AVE_TYPE long - -/* Convert that into an integer that is 100 for a load average of 1.0 */ - -#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) +/* Do not define LOAD_AVE_TYPE or LOAD_AVE_CVT + since there is no load average available. */ /* Define VIRT_ADDR_VARIES if the virtual addresses of pure and impure space as loaded can vary, and even their @@ -168,7 +118,7 @@ Boston, MA 02111-1307, USA. */ /* Define this to be the separator between devices and paths */ #define DEVICE_SEP ':' -#define DIRECTORY_SEP '\\' +#define DIRECTORY_SEP ((char)XCHAR(Vdirectory_sep_char)) /* The null device on Windows NT. */ #define NULL_DEVICE "NUL:" @@ -183,13 +133,10 @@ Boston, MA 02111-1307, USA. */ #ifndef NOT_C_CODE #include -#include +#include <../mingw/process.h> #define mkdir __mkdir #include #undef mkdir -#ifdef HAVE_CYGWIN_VERSION_H -#include -#endif /* IO calls that are emulated or shadowed */ #define pipe sys_pipe @@ -242,16 +189,14 @@ uid_t geteuid (void); gid_t getgid (void); gid_t getegid (void); -#if CYGWIN_VERSION_DLL_MAJOR <= 21 -#define _ftime ftime -#define _timeb timeb -#endif - /* Stuff that gets set wrongly or otherwise */ #define HAVE_SETITIMER #define HAVE_GETTIMEOFDAY #define HAVE_SELECT -/*#define HAVE_STRUCT_UTIMBUF*/ +/* systime.h includes winsock.h which defines timeval */ +#define HAVE_TIMEVAL +#define HAVE_GETPAGESIZE +#define getpagesize() 4096 #ifndef HAVE_H_ERRNO #define HAVE_H_ERRNO #endif @@ -263,13 +208,14 @@ gid_t getegid (void); #undef HAVE_SYS_WAIT_H #undef HAVE_TERMIOS #undef SYSV_SYSTEM_DIR +#undef CLASH_DETECTION /* We now have emulation for some signals */ #define HAVE_SIGHOLD -#define sigset(s,h) msw_sigset(s,h) -#define sighold(s) msw_sighold(s) -#define sigrelse(s) msw_sigrelse(s) -#define sigpause(s) msw_sigpause(s) +#define sigset(s,h) mswindows_sigset(s,h) +#define sighold(s) mswindows_sighold(s) +#define sigrelse(s) mswindows_sigrelse(s) +#define sigpause(s) mswindows_sigpause(s) #define signal sigset /* Defines that we need that aren't in the standard signal.h */ @@ -282,11 +228,7 @@ gid_t getegid (void); #ifndef MAXPATHLEN #define MAXPATHLEN _MAX_PATH #endif - -/* For integration with MSDOS support. */ -#define getdisk() (_getdrive () - 1) -#define getdefdir(_drv, _buf) _getdcwd (_drv, _buf, MAXPATHLEN) -#endif +#endif /* !NOT_C_CODE */ /* Define for those source files that do not include enough NT system files. */ @@ -301,5 +243,7 @@ gid_t getegid (void); /* Define process implementation */ #define HAVE_WIN32_PROCESSES -/* ============================================================ */ - +#define CORRECT_DIR_SEPS(s) \ + do { if ('/' == DIRECTORY_SEP) dostounix_filename (s); \ + else unixtodos_filename (s); \ + } while (0)