Skip to content

Commit db64df4

Browse files
tglsfdctglsfdc
committed
Fix contrib/cube and contrib/seg to compile on Windows.
Andreas Pflug
1 parent 92244e8 commit db64df4

File tree

6 files changed

+59
-63
lines changed

6 files changed

+59
-63
lines changed

‎contrib/cube/cube.c

Lines changed: 48 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
#include "cubedata.h"
1717

18-
#define max(a,b) ((a) > (b) ? (a) : (b))
19-
#define min(a,b) ((a) <= (b) ? (a) : (b))
2018
#define abs(a) ((a) < (0) ? (-a) : (a))
2119

2220
extern int cube_yyparse();
@@ -590,8 +588,8 @@ cube_union(NDBOX * a, NDBOX * b)
590588
*/
591589
for (i = 0; i < b->dim; i++)
592590
{
593-
result->x[i] = min(b->x[i], b->x[i + b->dim]);
594-
result->x[i + a->dim] = max(b->x[i], b->x[i + b->dim]);
591+
result->x[i] = Min(b->x[i], b->x[i + b->dim]);
592+
result->x[i + a->dim] = Max(b->x[i], b->x[i + b->dim]);
595593
}
596594
for (i = b->dim; i < a->dim; i++)
597595
{
@@ -603,8 +601,8 @@ cube_union(NDBOX * a, NDBOX * b)
603601
for (i = 0; i < a->dim; i++)
604602
{
605603
result->x[i] =
606-
min(min(a->x[i], a->x[i + a->dim]), result->x[i]);
607-
result->x[i + a->dim] = max(max(a->x[i],
604+
Min(Min(a->x[i], a->x[i + a->dim]), result->x[i]);
605+
result->x[i + a->dim] = Max(Max(a->x[i],
608606
a->x[i + a->dim]), result->x[i + a->dim]);
609607
}
610608

@@ -648,8 +646,8 @@ cube_inter(NDBOX * a, NDBOX * b)
648646
*/
649647
for (i = 0; i < b->dim; i++)
650648
{
651-
result->x[i] = min(b->x[i], b->x[i + b->dim]);
652-
result->x[i + a->dim] = max(b->x[i], b->x[i + b->dim]);
649+
result->x[i] = Min(b->x[i], b->x[i + b->dim]);
650+
result->x[i + a->dim] = Max(b->x[i], b->x[i + b->dim]);
653651
}
654652
for (i = b->dim; i < a->dim; i++)
655653
{
@@ -661,8 +659,8 @@ cube_inter(NDBOX * a, NDBOX * b)
661659
for (i = 0; i < a->dim; i++)
662660
{
663661
result->x[i] =
664-
max(min(a->x[i], a->x[i + a->dim]), result->x[i]);
665-
result->x[i + a->dim] = min(max(a->x[i],
662+
Max(Min(a->x[i], a->x[i + a->dim]), result->x[i]);
663+
result->x[i + a->dim] = Min(Max(a->x[i],
666664
a->x[i + a->dim]), result->x[i + a->dim]);
667665
}
668666

@@ -720,8 +718,8 @@ cube_over_left(NDBOX * a, NDBOX * b)
720718
if ((a == NULL) || (b == NULL))
721719
return (FALSE);
722720

723-
return (min(a->x[a->dim - 1], a->x[2 * a->dim - 1]) <=
724-
min(b->x[b->dim - 1], b->x[2 * b->dim - 1]) &&
721+
return (Min(a->x[a->dim - 1], a->x[2 * a->dim - 1]) <=
722+
Min(b->x[b->dim - 1], b->x[2 * b->dim - 1]) &&
725723
!cube_left(a, b) && !cube_right(a, b));
726724
}
727725

@@ -733,8 +731,8 @@ cube_over_right(NDBOX * a, NDBOX * b)
733731
if ((a == NULL) || (b == NULL))
734732
return (FALSE);
735733

736-
return (min(a->x[a->dim - 1], a->x[2 * a->dim - 1]) >=
737-
min(b->x[b->dim - 1], b->x[2 * b->dim - 1]) &&
734+
return (Min(a->x[a->dim - 1], a->x[2 * a->dim - 1]) >=
735+
Min(b->x[b->dim - 1], b->x[2 * b->dim - 1]) &&
738736
!cube_left(a, b) && !cube_right(a, b));
739737
}
740738

@@ -747,8 +745,8 @@ cube_left(NDBOX * a, NDBOX * b)
747745
if ((a == NULL) || (b == NULL))
748746
return (FALSE);
749747

750-
return (min(a->x[a->dim - 1], a->x[2 * a->dim - 1]) <
751-
min(b->x[0], b->x[b->dim]));
748+
return (Min(a->x[a->dim - 1], a->x[2 * a->dim - 1]) <
749+
Min(b->x[0], b->x[b->dim]));
752750
}
753751

754752
/* return 'true' if the projection of 'a' is
@@ -759,8 +757,8 @@ cube_right(NDBOX * a, NDBOX * b)
759757
if ((a == NULL) || (b == NULL))
760758
return (FALSE);
761759

762-
return (min(a->x[0], a->x[a->dim]) >
763-
min(b->x[b->dim - 1], b->x[2 * b->dim - 1]));
760+
return (Min(a->x[0], a->x[a->dim]) >
761+
Min(b->x[b->dim - 1], b->x[2 * b->dim - 1]));
764762
}
765763

766764
/* make up a metric in which one box will be 'lower' than the other
@@ -771,25 +769,25 @@ cube_cmp(NDBOX * a, NDBOX * b)
771769
int i;
772770
int dim;
773771

774-
dim = min(a->dim, b->dim);
772+
dim = Min(a->dim, b->dim);
775773

776774
/* compare the common dimensions */
777775
for (i = 0; i < dim; i++)
778776
{
779-
if (min(a->x[i], a->x[a->dim + i]) >
780-
min(b->x[i], b->x[b->dim + i]))
777+
if (Min(a->x[i], a->x[a->dim + i]) >
778+
Min(b->x[i], b->x[b->dim + i]))
781779
return 1;
782-
if (min(a->x[i], a->x[a->dim + i]) <
783-
min(b->x[i], b->x[b->dim + i]))
780+
if (Min(a->x[i], a->x[a->dim + i]) <
781+
Min(b->x[i], b->x[b->dim + i]))
784782
return -1;
785783
}
786784
for (i = 0; i < dim; i++)
787785
{
788-
if (max(a->x[i], a->x[a->dim + i]) >
789-
max(b->x[i], b->x[b->dim + i]))
786+
if (Max(a->x[i], a->x[a->dim + i]) >
787+
Max(b->x[i], b->x[b->dim + i]))
790788
return 1;
791-
if (max(a->x[i], a->x[a->dim + i]) <
792-
max(b->x[i], b->x[b->dim + i]))
789+
if (Max(a->x[i], a->x[a->dim + i]) <
790+
Max(b->x[i], b->x[b->dim + i]))
793791
return -1;
794792
}
795793

@@ -798,16 +796,16 @@ cube_cmp(NDBOX * a, NDBOX * b)
798796
{
799797
for (i = dim; i < a->dim; i++)
800798
{
801-
if (min(a->x[i], a->x[a->dim + i]) > 0)
799+
if (Min(a->x[i], a->x[a->dim + i]) > 0)
802800
return 1;
803-
if (min(a->x[i], a->x[a->dim + i]) < 0)
801+
if (Min(a->x[i], a->x[a->dim + i]) < 0)
804802
return -1;
805803
}
806804
for (i = dim; i < a->dim; i++)
807805
{
808-
if (max(a->x[i], a->x[a->dim + i]) > 0)
806+
if (Max(a->x[i], a->x[a->dim + i]) > 0)
809807
return 1;
810-
if (max(a->x[i], a->x[a->dim + i]) < 0)
808+
if (Max(a->x[i], a->x[a->dim + i]) < 0)
811809
return -1;
812810
}
813811

@@ -821,16 +819,16 @@ cube_cmp(NDBOX * a, NDBOX * b)
821819
{
822820
for (i = dim; i < b->dim; i++)
823821
{
824-
if (min(b->x[i], b->x[b->dim + i]) > 0)
822+
if (Min(b->x[i], b->x[b->dim + i]) > 0)
825823
return -1;
826-
if (min(b->x[i], b->x[b->dim + i]) < 0)
824+
if (Min(b->x[i], b->x[b->dim + i]) < 0)
827825
return 1;
828826
}
829827
for (i = dim; i < b->dim; i++)
830828
{
831-
if (max(b->x[i], b->x[b->dim + i]) > 0)
829+
if (Max(b->x[i], b->x[b->dim + i]) > 0)
832830
return -1;
833-
if (max(b->x[i], b->x[b->dim + i]) < 0)
831+
if (Max(b->x[i], b->x[b->dim + i]) < 0)
834832
return 1;
835833
}
836834

@@ -911,13 +909,13 @@ cube_contains(NDBOX * a, NDBOX * b)
911909
}
912910

913911
/* Can't care less about the excess dimensions of (a), if any */
914-
for (i = 0; i < min(a->dim, b->dim); i++)
912+
for (i = 0; i < Min(a->dim, b->dim); i++)
915913
{
916-
if (min(a->x[i], a->x[a->dim + i]) >
917-
min(b->x[i], b->x[b->dim + i]))
914+
if (Min(a->x[i], a->x[a->dim + i]) >
915+
Min(b->x[i], b->x[b->dim + i]))
918916
return (FALSE);
919-
if (max(a->x[i], a->x[a->dim + i]) <
920-
max(b->x[i], b->x[b->dim + i]))
917+
if (Max(a->x[i], a->x[a->dim + i]) <
918+
Max(b->x[i], b->x[b->dim + i]))
921919
return (FALSE);
922920
}
923921

@@ -961,20 +959,20 @@ cube_overlap(NDBOX * a, NDBOX * b)
961959
/* compare within the dimensions of (b) */
962960
for (i = 0; i < b->dim; i++)
963961
{
964-
if (min(a->x[i], a->x[a->dim + i]) >
965-
max(b->x[i], b->x[b->dim + i]))
962+
if (Min(a->x[i], a->x[a->dim + i]) >
963+
Max(b->x[i], b->x[b->dim + i]))
966964
return (FALSE);
967-
if (max(a->x[i], a->x[a->dim + i]) <
968-
min(b->x[i], b->x[b->dim + i]))
965+
if (Max(a->x[i], a->x[a->dim + i]) <
966+
Min(b->x[i], b->x[b->dim + i]))
969967
return (FALSE);
970968
}
971969

972970
/* compare to zero those dimensions in (a) absent in (b) */
973971
for (i = b->dim; i < a->dim; i++)
974972
{
975-
if (min(a->x[i], a->x[a->dim + i]) > 0)
973+
if (Min(a->x[i], a->x[a->dim + i]) > 0)
976974
return (FALSE);
977-
if (max(a->x[i], a->x[a->dim + i]) < 0)
975+
if (Max(a->x[i], a->x[a->dim + i]) < 0)
978976
return (FALSE);
979977
}
980978

@@ -1031,11 +1029,11 @@ distance_1D(double a1, double a2, double b1, double b2)
10311029
{
10321030
/* interval (a) is entirely on the left of (b) */
10331031
if ((a1 <= b1) && (a2 <= b1) && (a1 <= b2) && (a2 <= b2))
1034-
return (min(b1, b2) - max(a1, a2));
1032+
return (Min(b1, b2) - Max(a1, a2));
10351033

10361034
/* interval (a) is entirely on the right of (b) */
10371035
if ((a1 > b1) && (a2 > b1) && (a1 > b2) && (a2 > b2))
1038-
return (min(a1, a2) - max(b1, b2));
1036+
return (Min(a1, a2) - Max(b1, b2));
10391037

10401038
/* the rest are all sorts of intersections */
10411039
return (0.0);
@@ -1074,7 +1072,7 @@ cube_ll_coord(NDBOX * a, int4 n)
10741072
result = (double *) palloc(sizeof(double));
10751073
*result = 0;
10761074
if (a->dim >= n && n > 0)
1077-
*result = min(a->x[n - 1], a->x[a->dim + n - 1]);
1075+
*result = Min(a->x[n - 1], a->x[a->dim + n - 1]);
10781076
return result;
10791077
}
10801078

@@ -1087,7 +1085,7 @@ cube_ur_coord(NDBOX * a, int4 n)
10871085
result = (double *) palloc(sizeof(double));
10881086
*result = 0;
10891087
if (a->dim >= n && n > 0)
1090-
*result = max(a->x[n - 1], a->x[a->dim + n - 1]);
1088+
*result = Max(a->x[n - 1], a->x[a->dim + n - 1]);
10911089
return result;
10921090
}
10931091

‎contrib/cube/cubeparse.y

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static NDBOX * write_point_as_box(char *s, int dim);
2828
%}
2929

3030
/* BISON Declarations */
31-
%token FLOAT O_PAREN C_PAREN O_BRACKET C_BRACKET COMMA
31+
%token CUBEFLOAT O_PAREN C_PAREN O_BRACKET C_BRACKET COMMA
3232
%start box
3333

3434
/* Grammar follows */
@@ -128,13 +128,13 @@ paren_list:
128128
;
129129

130130
list:
131-
FLOAT {
131+
CUBEFLOAT {
132132
/* alloc enough space to be sure whole list will fit */
133133
$$ = palloc(scanbuflen + 1);
134134
strcpy($$, $1);
135135
}
136136
|
137-
list COMMA FLOAT {
137+
list COMMA CUBEFLOAT {
138138
$$ = $1;
139139
strcat($$, ",");
140140
strcat($$, $3);

‎contrib/cube/cubescan.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ float ({integer}|{real})([eE]{integer})?
3939

4040
%%
4141

42-
{float} yylval = yytext; return FLOAT;
42+
{float} yylval = yytext; return CUBEFLOAT;
4343
\[ yylval = "("; return O_BRACKET;
4444
\] yylval = ")"; return C_BRACKET;
4545
\( yylval = "("; return O_PAREN;

‎contrib/seg/seg.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
#include "segdata.h"
1616

17-
#define max(a,b) ((a) > (b) ? (a) : (b))
18-
#define min(a,b) ((a) <= (b) ? (a) : (b))
1917
#define abs(a) ((a) < (0) ? (-a) : (a))
2018

2119
/*
@@ -924,7 +922,7 @@ restore(char *result, float val, int n)
924922
* put a cap on the number of siugnificant digits to avoid nonsense in
925923
* the output
926924
*/
927-
n = min(n, FLT_DIG);
925+
n = Min(n, FLT_DIG);
928926

929927
/* remember the sign */
930928
sign = (val < 0 ? 1 : 0);
@@ -946,7 +944,7 @@ restore(char *result, float val, int n)
946944
if (exp == 0)
947945
{
948946
/* use the supplied mantyssa with sign */
949-
strcpy((char *) index(result, 'e'), "");
947+
strcpy((char *) strchr(result, 'e'), "");
950948
}
951949
else
952950
{

‎contrib/seg/segparse.y

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
} bnd;
3939
char * text;
4040
}
41-
%token <text> FLOAT
41+
%token <text> SEGFLOAT
4242
%token <text> RANGE
4343
%token <text> PLUMIN
4444
%token <text> EXTENSION
@@ -105,21 +105,21 @@ range:
105105
;
106106

107107
boundary:
108-
FLOAT {
108+
SEGFLOAT {
109109
$$.ext = '\0';
110110
$$.sigd = significant_digits($1);
111111
$$.val = seg_atof($1);
112112
}
113113
|
114-
EXTENSION FLOAT {
114+
EXTENSION SEGFLOAT {
115115
$$.ext = $1[0];
116116
$$.sigd = significant_digits($2);
117117
$$.val = seg_atof($2);
118118
}
119119
;
120120

121121
deviation:
122-
FLOAT {
122+
SEGFLOAT {
123123
$$.ext = '\0';
124124
$$.sigd = significant_digits($1);
125125
$$.val = seg_atof($1);

‎contrib/seg/segscan.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ float ({integer}|{real})([eE]{integer})?
4141

4242
{range} yylval.text = yytext; return RANGE;
4343
{plumin} yylval.text = yytext; return PLUMIN;
44-
{float} yylval.text = yytext; return FLOAT;
44+
{float} yylval.text = yytext; return SEGFLOAT;
4545
\< yylval.text = "<"; return EXTENSION;
4646
\> yylval.text = ">"; return EXTENSION;
4747
\~ yylval.text = "~"; return EXTENSION;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy