Mercurial > hg > xemacs-beta

comparison src/sysfile.h @ 4736:d261888e5069

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix Win32 native build after my DEFAULT_DIRECTORY_FALLBACK change, thanks Vin! src/ChangeLog addition: 2009-11-09 Aidan Kehoe <kehoea@parhasard.net> * sysfile.h (DEFAULT_DIRECTORY_FALLBACK): Move the WIN32_NATIVE definition inside the #ifdef emacs conditional, clear up the comment after #else; thanks for the build failure report, Vin! Cast DEFAULT_DIRECTORY_FALLBACK to (const CIbyte *) by default, which better reflects its contents. * editfns.c (get_home_directory): * buffer.c (init_initial_directory): Cast DEFAULT_DIRECTORY_FALLBACK to (Ibyte *) with functions that take that type, now that is necessary.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 09 Nov 2009 18:00:10 +0000
parents a5210e70ffbe
children aa5ed11f473b
comparison
equal deleted inserted replaced
4735:80d74fed5399 4736:d261888e5069
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