1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 19:29:09 +00:00

Rename UniChar to plUniChar to avoid conflict on OSX.

OSX defines a UniChar type as part of the OS headers.
This commit is contained in:
Darryl Pogue
2014-10-12 23:51:33 -07:00
committed by Darryl Pogue
parent ccd5687e61
commit 95c52c0912
3 changed files with 17 additions and 17 deletions

View File

@ -54,7 +54,7 @@ plString PyString_AsStringEx(PyObject* obj)
#if (Py_UNICODE_SIZE == 2)
return plString::FromUtf16(reinterpret_cast<const uint16_t *>(PyUnicode_AsUnicode(obj)));
#elif (Py_UNICODE_SIZE == 4)
return plString::FromUtf32(reinterpret_cast<const UniChar *>(PyUnicode_AsUnicode(obj)));
return plString::FromUtf32(reinterpret_cast<const plUniChar *>(PyUnicode_AsUnicode(obj)));
#else
# error "Py_UNICODE is an unexpected size"
#endif