Mercurial > hg > xemacs-beta

comparison src/sysfile.h @ 4854:95c4ced5c07c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix compile problems -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-01-14 Ben Wing <ben@xemacs.org> * glyphs-eimage.c: Turn on fixes for conflicts between jmorecfg.h and windows.h on Cygwin, too. * emacs.c (debug_can_access_memory): * lisp.h: Declare function const void * to avoid warnings. * sysfile.h: Include syswindows.h on Windows to avoid problems using things like PATHNAME_CONVERT_OUT. * sysfile.h (X_OK): * dialog-msw.c (handle_directory_proc): * dialog-msw.c (handle_directory_dialog_box): * nt.c (Fmswindows_short_file_name): * sysdep.c (qxe_allocating_getcwd): * syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR): * unexcw.c (unexec): * unexnt.c (_start): * win32.c (mswindows_read_link_1): Rename PATH_MAX_EXTERNAL to PATH_MAX_TSTR to reflect its actual semantics. * unexcw.c: Remove include of syswindows.h that had been added because sysfile.h didn't include it.
author Ben Wing <ben@xemacs.org>
date Thu, 14 Jan 2010 01:25:16 -0600
parents b3ea9c582280
children 5ab6dc5d789e
comparison
equal deleted inserted replaced
4853:d35e231d347d 4854:95c4ced5c07c
83 and sunplay.c. However, Cygwin includes this automatically from 83 and sunplay.c. However, Cygwin includes this automatically from
84 fcntl.h, and Martin says that a "conforming" system should never 84 fcntl.h, and Martin says that a "conforming" system should never
85 need this. We will put it back if necessary on systems requiring it. */ 85 need this. We will put it back if necessary on systems requiring it. */
86 /* # include <sys/fcntl.h> */ 86 /* # include <sys/fcntl.h> */
87 #endif /* WIN32_NATIVE */ 87 #endif /* WIN32_NATIVE */
88
89 /* Needed for C_STRING_TO_TSTR, MAX_XETCHAR_SIZE below; but syswindows.h
90 depends on lisp.h being previously included. */
91 #if defined (WIN32_ANY) && defined (emacs)
92 # include "syswindows.h"
93 #endif
88 94
89 #ifndef STDERR_FILENO 95 #ifndef STDERR_FILENO
90 #define STDIN_FILENO 0 96 #define STDIN_FILENO 0
91 #define STDOUT_FILENO 1 97 #define STDOUT_FILENO 1
92 #define STDERR_FILENO 2 98 #define STDERR_FILENO 2
300 # define QXE_PATH_MAX ROUND_UP_TO_EVEN_NUMBER (MAXPATHLEN) 306 # define QXE_PATH_MAX ROUND_UP_TO_EVEN_NUMBER (MAXPATHLEN)
301 #else 307 #else
302 # define QXE_PATH_MAX 1024 308 # define QXE_PATH_MAX 1024
303 #endif 309 #endif
304 310
305 /* Client .c files should use PATH_MAX_INTERNAL or PATH_MAX_EXTERNAL 311 /* Client .c files should use PATH_MAX_INTERNAL or PATH_MAX_TCHAR
306 if they must use either one at all. */ 312 if they must use either one at all. */
307 313
308 /* Use for internally formatted text, which can potentially have up to 314 /* Use for internally formatted text, which can potentially have up to
309 four bytes per character */ 315 four bytes per character */
310 #define PATH_MAX_INTERNAL (QXE_PATH_MAX * MAX_ICHAR_LEN) 316 #define PATH_MAX_INTERNAL (QXE_PATH_MAX * MAX_ICHAR_LEN)
311 /* Use for externally formatted text. */ 317 #ifdef WIN32_ANY
312 #define PATH_MAX_EXTERNAL (QXE_PATH_MAX * MAX_XETCHAR_SIZE) 318 /* Use for externally formatted text in TCHAR's. */
319 #define PATH_MAX_TCHAR (QXE_PATH_MAX * MAX_XETCHAR_SIZE)
320 #endif
313 321
314 /* The following definitions are needed under Windows, at least */ 322 /* The following definitions are needed under Windows, at least */
315 #ifndef X_OK 323 #ifndef X_OK
316 # define X_OK 1 324 # define X_OK 1
317 #endif 325 #endif