github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ulalaca: Don't redefine char16_t and char32_t

Browse Source 
On MacOS, stdint.h is provided by the compiler for C, and by
the SDK for C++.

OSX 14.4 appears to define char16_t and char32_t within stdint.h for
C++.  Defining them again results in:

```
../common/arch.h:53:24: error: cannot combine with previous 'type-name' declaration specifier
typedef uint_least16_t char16_t;
                       ^
../common/arch.h:53:1: warning: typedef requires a name [-Wmissing-declarations]
typedef uint_least16_t char16_t;
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../common/arch.h:54:24: error: cannot combine with previous 'type-name' declaration specifier
typedef uint_least32_t char32_t;
                       ^
../common/arch.h:54:1: warning: typedef requires a name [-Wmissing-declarations]
typedef uint_least32_t char32_t;
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```
This commit is contained in:
matt335672
2026-02-23 14:03:14 +00:00
parent bbd950d552
commit 5fd81ae9cb
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/arch.h
+2
View File
@@ -49,6 +49,8 @@ typedef int bool_t;
// Define Unicode character types // Define Unicode character types
#if defined(HAVE_UCHAR_H) #if defined(HAVE_UCHAR_H)
#include <uchar.h> #include <uchar.h>
#elif defined (__APPLE__) && defined(__cplusplus)
// char16_t and char32_t are in stdint.h (C++ only)
#elif defined(HAVE_STDINT_H) #elif defined(HAVE_STDINT_H)
typedef uint_least16_t char16_t; typedef uint_least16_t char16_t;
typedef uint_least32_t char32_t; typedef uint_least32_t char32_t;