Mercurial > hg > xemacs-beta
comparison src/sysfile.h @ 4740:ff037e1dc33c
automatic merge
author | Stephen J. Turnbull <stephen@xemacs.org> |
---|---|
date | Thu, 12 Nov 2009 00:00:11 +0900 |
parents | d261888e5069 |
children | aa5ed11f473b |
comparison
equal
deleted
inserted
replaced
4739:679041362cd4 | 4740:ff037e1dc33c |
---|---|
483 | 483 |
484 return XCHAR (Vdirectory_sep_char); | 484 return XCHAR (Vdirectory_sep_char); |
485 } | 485 } |
486 #define DIRECTORY_SEP sysfile_get_directory_sep() | 486 #define DIRECTORY_SEP sysfile_get_directory_sep() |
487 | 487 |
488 #else /* emacs */ | 488 #define DEFAULT_DIRECTORY_FALLBACK ((const CIbyte *)"C:\\") |
489 | |
490 #else /* not emacs */ | |
489 | 491 |
490 /* The above Lisp variables are not available to make-docfile, etc. */ | 492 /* The above Lisp variables are not available to make-docfile, etc. */ |
491 #define DIRECTORY_SEP DEFAULT_DIRECTORY_SEP | 493 #define DIRECTORY_SEP DEFAULT_DIRECTORY_SEP |
492 | |
493 #define DEFAULT_DIRECTORY_FALLBACK ((Ibyte *)"C:\\") | |
494 | 494 |
495 #endif /* emacs */ | 495 #endif /* emacs */ |
496 | 496 |
497 #else /* not WIN32_NATIVE */ | 497 #else /* not WIN32_NATIVE */ |
498 | 498 |
499 #define SEPCHAR ':' | 499 #define SEPCHAR ':' |
500 #define DEFAULT_DIRECTORY_SEP '/' | 500 #define DEFAULT_DIRECTORY_SEP '/' |
501 #define DIRECTORY_SEP '/' | 501 #define DIRECTORY_SEP '/' |
502 #define DEFAULT_DIRECTORY_FALLBACK ((Ibyte *)"/") | 502 #define DEFAULT_DIRECTORY_FALLBACK ((const CIbyte *)"/") |
503 | 503 |
504 #endif /* WIN32_NATIVE */ | 504 #endif /* WIN32_NATIVE */ |
505 | 505 |
506 | 506 |
507 #ifdef WIN32_ANY | 507 #ifdef WIN32_ANY |