Skip to content

Commit 7cc7602

Browse files
committed
xrGame: rename collision with linux define function name
1 parent fc630bb commit 7cc7602

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/xrGame/ik/limb.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ int Limb::InLimits(const float x[7]) const
903903
return 1;
904904
}
905905

906-
float roundup(float x)
906+
float round_up(float x)
907907
{
908908
if (x < 0)
909909
x += 2 * M_PI;
@@ -914,7 +914,7 @@ void dump_file(char* file, int euler_type, float min[], float max[], Matrix c, M
914914
FILE* fp = fopen(file, "w");
915915

916916
fprintf(fp, "%d\n", euler_type);
917-
fprintf(fp, "%f %f %f \n", roundup(min[2]), roundup(min[1]), roundup(min[0]));
917+
fprintf(fp, "%f %f %f \n", round_up(min[2]), round_up(min[1]), round_up(min[0]));
918918
fprintf(fp, "%f %f %f \n", max[2], max[1], max[0]);
919919
for (int i = 0; i < 4; i++)
920920
fprintf(fp, "%f %f %f %f\n", c[i][0], c[i][1], c[i][2], c[i][3]);

0 commit comments

Comments
 (0)