Skip to content

Commit 11227a8

Browse files
authored
Renamed Point to work around the build failure (#18)
1 parent 6fd27e5 commit 11227a8

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

icuSources/common/ubidi.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2090,12 +2090,12 @@ addPoint(UBiDi *pBiDi, int32_t pos, int32_t flag)
20902090
*/
20912091
{
20922092
#define FIRSTALLOC 10
2093-
Point point;
2093+
_Point point;
20942094
InsertPoints * pInsertPoints=&(pBiDi->insertPoints);
20952095

20962096
if (pInsertPoints->capacity == 0)
20972097
{
2098-
pInsertPoints->points=static_cast<Point *>(uprv_malloc(sizeof(Point)*FIRSTALLOC));
2098+
pInsertPoints->points=static_cast<_Point *>(uprv_malloc(sizeof(_Point)*FIRSTALLOC));
20992099
if (pInsertPoints->points == NULL)
21002100
{
21012101
pInsertPoints->errorCode=U_MEMORY_ALLOCATION_ERROR;
@@ -2105,9 +2105,9 @@ addPoint(UBiDi *pBiDi, int32_t pos, int32_t flag)
21052105
}
21062106
if (pInsertPoints->size >= pInsertPoints->capacity) /* no room for new point */
21072107
{
2108-
Point * savePoints=pInsertPoints->points;
2109-
pInsertPoints->points=static_cast<Point *>(uprv_realloc(pInsertPoints->points,
2110-
pInsertPoints->capacity*2*sizeof(Point)));
2108+
_Point * savePoints=pInsertPoints->points;
2109+
pInsertPoints->points=static_cast<_Point *>(uprv_realloc(pInsertPoints->points,
2110+
pInsertPoints->capacity*2*sizeof(_Point)));
21112111
if (pInsertPoints->points == NULL)
21122112
{
21132113
pInsertPoints->points=savePoints;

icuSources/common/ubidiimp.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,17 +239,17 @@ enum {
239239

240240
/* InsertPoints structure for noting where to put BiDi marks ---------------- */
241241

242-
typedef struct Point {
242+
typedef struct _Point {
243243
int32_t pos; /* position in text */
244244
int32_t flag; /* flag for LRM/RLM, before/after */
245-
} Point;
245+
} _Point;
246246

247247
typedef struct InsertPoints {
248248
int32_t capacity; /* number of points allocated */
249249
int32_t size; /* number of points used */
250250
int32_t confirmed; /* number of points confirmed */
251251
UErrorCode errorCode; /* for eventual memory shortage */
252-
Point *points; /* pointer to array of points */
252+
_Point *points; /* pointer to array of points */
253253
} InsertPoints;
254254

255255

icuSources/common/ubidiln.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ ubidi_getRuns(UBiDi *pBiDi, UErrorCode*) {
682682

683683
/* handle insert LRM/RLM BEFORE/AFTER run */
684684
if(pBiDi->insertPoints.size>0) {
685-
Point *point, *start=pBiDi->insertPoints.points,
685+
_Point *point, *start=pBiDi->insertPoints.points,
686686
*limit=start+pBiDi->insertPoints.size;
687687
int32_t runIndex;
688688
for(point=start; point<limit; point++) {

0 commit comments

Comments
 (0)