User: aidan Date: 06/05/06 10:09:39 Modified: xemacs/src ChangeLog lisp.h symbols.c sysfile.h Log: Fix the win32 build following my lib-src/DOC format changes. Revision Changes Path 1.953 +10 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.952 retrieving revision 1.953 diff -u -p -r1.952 -r1.953 --- ChangeLog 2006/05/01 18:17:20 1.952 +++ ChangeLog 2006/05/06 08:09:35 1.953 ＠＠ -1,3 +1,13 ＠＠ +2006-05-06 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * lisp.h (struct Lisp_Subr): + Document that prompt, doc, and name should not be char *. + * symbols.c (Fsubr_name): + Cast name to const Ibyte * before returning it. + * sysfile.h: + Make versions of DIRECTORY_SEP, IS_DIRECTORY_SEP and IS_ANY_SEP + available to make-docfile and other non-emacs processes on win32. + 2006-04-30 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * font-mgr.c (string_list_to_fcobjectset): Remove debugging output. 1.142 +2 -0 XEmacs/xemacs/src/lisp.h Index: lisp.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v retrieving revision 1.141 retrieving revision 1.142 diff -u -p -r1.141 -r1.142 --- lisp.h 2006/03/30 23:10:38 1.141 +++ lisp.h 2006/05/06 08:09:36 1.142 ＠＠ -2676,6 +2676,8 ＠＠ struct Lisp_Subr struct lrecord_header lheader; short min_args; short max_args; + /* #### We should make these const Ascbyte * or const Ibyte *, not const + char *. */ const char *prompt; const char *doc; const char *name; 1.57 +1 -1 XEmacs/xemacs/src/symbols.c Index: symbols.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symbols.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -p -r1.56 -r1.57 --- symbols.c 2006/04/29 16:15:30 1.56 +++ symbols.c 2006/05/06 08:09:37 1.57 ＠＠ -729,7 +729,7 ＠＠ SUBR must be a built-in function. if (!SUBRP (subr)) wrong_type_argument (Qsubrp, subr); name = XSUBR (subr)->name; - return make_string (name, strlen (name)); + return make_string ((const Ibyte *)name, strlen (name)); } DEFUN ("setplist", Fsetplist, 2, 2, 0, /* 1.23 +26 -0 XEmacs/xemacs/src/sysfile.h Index: sysfile.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysfile.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- sysfile.h 2006/04/29 16:15:31 1.22 +++ sysfile.h 2006/05/06 08:09:37 1.23 ＠＠ -467,6 +467,7 ＠＠ const char *strerror (int); #define SEPCHAR ';' #define DEFAULT_DIRECTORY_SEP '\\' +#ifdef emacs DECLARE_INLINE_HEADER (Ibyte sysfile_get_directory_sep (void)) { if (!CHARP (Vdirectory_sep_char) ＠＠ -484,6 +485,13 ＠＠ DECLARE_INLINE_HEADER (Ibyte sysfile_get } #define DIRECTORY_SEP sysfile_get_directory_sep() +#else /* emacs */ + +/* The above Lisp variables are not available to make-docfile, etc. */ +#define DIRECTORY_SEP DEFAULT_DIRECTORY_SEP + +#endif /* emacs */ + #else /* not WIN32_NATIVE */ #define SEPCHAR ':' ＠＠ -499,6 +507,8 ＠＠ DECLARE_INLINE_HEADER (Ibyte sysfile_get #define IS_DEVICE_SEP(c) ((c) == DEVICE_SEP) +#ifdef emacs + DECLARE_INLINE_HEADER (int IS_DIRECTORY_SEP (Ichar c)) { return (c == '/' || c == '\\'); ＠＠ -508,6 +518,22 ＠＠ DECLARE_INLINE_HEADER (int IS_ANY_SEP (I { return (c == '/' || c == '\\' || c == ':'); } + +#else /* emacs */ + +/* The Ichar typedef is not available to make-docfile, etc. */ + +DECLARE_INLINE_HEADER (int IS_DIRECTORY_SEP (int c)) +{ + return (c == '/' || c == '\\'); +} + +DECLARE_INLINE_HEADER (int IS_ANY_SEP (int c)) +{ + return (c == '/' || c == '\\' || c == ':'); +} + +#endif #else /* not WIN32_ANY */