Skip to content

fakesdio.h, utf8.h : Use legal macro name #23845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 14, 2025
Merged

fakesdio.h, utf8.h : Use legal macro name #23845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7df55ad
fakesdio.h: Use legal macro name
khwilliamson Oct 13, 2025
aa69fe4
utf8.h: Use legal macro name
khwilliamson Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions fakesdio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* This is "source level" stdio compatibility mode.
* We try and #define stdio functions in terms of PerlIO.
*/
#define _CANNOT "CANNOT"
#define CANNOT_ "CANNOT"
#undef FILE
#define FILE PerlIO
#undef clearerr
Expand Down Expand Up @@ -88,8 +88,8 @@
#define fread(b,s,c,f) PerlIO_read(f,b,(s*c))
#define fwrite(b,s,c,f) PerlIO_write(f,b,(s*c))
#else
#define fread(b,s,c,f) _CANNOT fread
#define fwrite(b,s,c,f) _CANNOT fwrite
#define fread(b,s,c,f) CANNOT_ fread
#define fwrite(b,s,c,f) CANNOT_ fwrite
#endif
#define fseek(f,o,w) PerlIO_seek(f,o,w)
#define ftell(f) PerlIO_tell(f)
Expand All @@ -102,25 +102,25 @@
#define popen(c,m) my_popen(c,m)
#define pclose(f) my_pclose(f)

#define fsetpos(f,p) _CANNOT _fsetpos_
#define fgetpos(f,p) _CANNOT _fgetpos_
#define fsetpos(f,p) CANNOT_ _fsetpos_
#define fgetpos(f,p) CANNOT_ _fgetpos_

#define __filbuf(f) _CANNOT __filbuf_
#define _filbuf(f) _CANNOT _filbuf_
#define __flsbuf(c,f) _CANNOT __flsbuf_
#define _flsbuf(c,f) _CANNOT _flsbuf_
#define getw(f) _CANNOT _getw_
#define putw(v,f) _CANNOT _putw_
#define __filbuf(f) CANNOT_ __filbuf_
#define _filbuf(f) CANNOT_ _filbuf_
#define __flsbuf(c,f) CANNOT_ __flsbuf_
#define _flsbuf(c,f) CANNOT_ _flsbuf_
#define getw(f) CANNOT_ _getw_
#define putw(v,f) CANNOT_ _putw_
#if SFIO_VERSION < 20000101L
#define flockfile(f) _CANNOT _flockfile_
#define ftrylockfile(f) _CANNOT _ftrylockfile_
#define funlockfile(f) _CANNOT _funlockfile_
#define flockfile(f) CANNOT_ _flockfile_
#define ftrylockfile(f) CANNOT_ _ftrylockfile_
#define funlockfile(f) CANNOT_ _funlockfile_
#endif
#define freopen(p,m,f) _CANNOT _freopen_
#define setbuf(f,b) _CANNOT _setbuf_
#define setvbuf(f,b,x,s) _CANNOT _setvbuf_
#define fscanf _CANNOT _fscanf_
#define fgets(s,n,f) _CANNOT _fgets_
#define freopen(p,m,f) CANNOT_ _freopen_
#define setbuf(f,b) CANNOT_ _setbuf_
#define setvbuf(f,b,x,s) CANNOT_ _setvbuf_
#define fscanf CANNOT_ _fscanf_
#define fgets(s,n,f) CANNOT_ _fgets_

/*
* ex: set ts=8 sts=4 sw=4 et:
Expand Down
16 changes: 8 additions & 8 deletions utf8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,27 +895,27 @@ implementation of the latter. */
* directly anywhere else. 'translate_function' is either NATIVE_TO_LATIN1
* (which works for code points up through 0xFF) or NATIVE_TO_UNI which works
* for any code point */
#define __BASE_TWO_BYTE_HI(c, translate_function) \
#define BASE_TWO_BYTE_HI_(c, translate_function) \
(assert(! UVCHR_IS_INVARIANT(c)), \
I8_TO_NATIVE_UTF8((translate_function(c) >> UTF_ACCUMULATION_SHIFT) \
| UTF_START_MARK(2)))
#define __BASE_TWO_BYTE_LO(c, translate_function) \
#define BASE_TWO_BYTE_LO_(c, translate_function) \
(assert(! UVCHR_IS_INVARIANT(c)), \
I8_TO_NATIVE_UTF8((translate_function(c) & UTF_CONTINUATION_MASK) \
| UTF_CONTINUATION_MARK))

/* The next two macros should not be used. They were designed to be usable as
* the case label of a switch statement, but this doesn't work for EBCDIC. Use
* regen/unicode_constants.pl instead */
#define UTF8_TWO_BYTE_HI_nocast(c) __BASE_TWO_BYTE_HI(c, NATIVE_TO_UNI)
#define UTF8_TWO_BYTE_LO_nocast(c) __BASE_TWO_BYTE_LO(c, NATIVE_TO_UNI)
#define UTF8_TWO_BYTE_HI_nocast(c) BASE_TWO_BYTE_HI_(c, NATIVE_TO_UNI)
#define UTF8_TWO_BYTE_LO_nocast(c) BASE_TWO_BYTE_LO_(c, NATIVE_TO_UNI)

/* The next two macros are used when the source should be a single byte
* character; checked for under DEBUGGING */
#define UTF8_EIGHT_BIT_HI(c) (assert(FITS_IN_8_BITS(c)), \
( __BASE_TWO_BYTE_HI(c, NATIVE_TO_LATIN1)))
( BASE_TWO_BYTE_HI_(c, NATIVE_TO_LATIN1)))
#define UTF8_EIGHT_BIT_LO(c) (assert(FITS_IN_8_BITS(c)), \
(__BASE_TWO_BYTE_LO(c, NATIVE_TO_LATIN1)))
(BASE_TWO_BYTE_LO_(c, NATIVE_TO_LATIN1)))

/* These final two macros in the series are used when the source can be any
* code point whose UTF-8 is known to occupy 2 bytes; they are less efficient
Expand All @@ -926,11 +926,11 @@ implementation of the latter. */
#define UTF8_TWO_BYTE_HI(c) \
(assert((sizeof(c) == 1) \
|| !(((WIDEST_UTYPE)(c)) & ~MAX_UTF8_TWO_BYTE)), \
(__BASE_TWO_BYTE_HI(c, NATIVE_TO_UNI)))
(BASE_TWO_BYTE_HI_(c, NATIVE_TO_UNI)))
#define UTF8_TWO_BYTE_LO(c) \
(assert((sizeof(c) == 1) \
|| !(((WIDEST_UTYPE)(c)) & ~MAX_UTF8_TWO_BYTE)), \
(__BASE_TWO_BYTE_LO(c, NATIVE_TO_UNI)))
(BASE_TWO_BYTE_LO_(c, NATIVE_TO_UNI)))

/* This is illegal in any well-formed UTF-8 in both EBCDIC and ASCII
* as it is only in overlongs. */
Expand Down
Loading