You've already forked UnrealEngineUWP
mirror of
https://github.com/izzy2lost/UnrealEngineUWP.git
synced 2026-03-26 18:15:20 -07:00
2c763c1971
Unshelved from pending changelist '4792932': Source=CL 4784913 in //UE4/Main/... Acknowledger=joe.conley (Thu Jan 24 2019 17:07:18 GMT+0000 (Coordinated Universal Time)) ShelfCl=4792932 Target=Dev-VR Merge conflict: /src/ROBOMERGE_DEVVR_Dev_VR/Engine/Plugins/Runtime/nDisplay/Source/DisplayCluster/Private/Render/Devices/DisplayClusterDeviceBase.cpp - merging //UE4/Main/Engine/Plugins/Runtime/nDisplay/Source/DisplayCluster/Private/Render/Devices/DisplayClusterDeviceBase.cpp#7 /src/ROBOMERGE_DEVVR_Dev_VR/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy.sln - resolving delete from //UE4/Main/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy.sln#2 Delete resolve: at: delete ay: ignore /src/ROBOMERGE_DEVVR_Dev_VR/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy.vcxproj.filters - resolving delete from //UE4/Main/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy... Copying //UE4/Dev-Enterprise @ cl 4784880 to Dev-Main (//UE4/Dev-Main) #rb none [CL 4800808 by Joe Conley in Dev-VR branch]
28 lines
1.1 KiB
C
28 lines
1.1 KiB
C
#define PyBytesObject PyStringObject
|
|
#define PyBytes_Type PyString_Type
|
|
|
|
#define PyBytes_Check PyString_Check
|
|
#define PyBytes_CheckExact PyString_CheckExact
|
|
#define PyBytes_CHECK_INTERNED PyString_CHECK_INTERNED
|
|
#define PyBytes_AS_STRING PyString_AS_STRING
|
|
#define PyBytes_GET_SIZE PyString_GET_SIZE
|
|
#define Py_TPFLAGS_BYTES_SUBCLASS Py_TPFLAGS_STRING_SUBCLASS
|
|
|
|
#define PyBytes_FromStringAndSize PyString_FromStringAndSize
|
|
#define PyBytes_FromString PyString_FromString
|
|
#define PyBytes_FromFormatV PyString_FromFormatV
|
|
#define PyBytes_FromFormat PyString_FromFormat
|
|
#define PyBytes_Size PyString_Size
|
|
#define PyBytes_AsString PyString_AsString
|
|
#define PyBytes_Repr PyString_Repr
|
|
#define PyBytes_Concat PyString_Concat
|
|
#define PyBytes_ConcatAndDel PyString_ConcatAndDel
|
|
#define _PyBytes_Resize _PyString_Resize
|
|
#define _PyBytes_Eq _PyString_Eq
|
|
#define PyBytes_Format PyString_Format
|
|
#define _PyBytes_FormatLong _PyString_FormatLong
|
|
#define PyBytes_DecodeEscape PyString_DecodeEscape
|
|
#define _PyBytes_Join _PyString_Join
|
|
#define PyBytes_AsStringAndSize PyString_AsStringAndSize
|
|
#define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping
|