Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8adc838

Browse files
committed
Various cleanups for the i386_solaris environment
1 parent4341652 commit8adc838

File tree

3 files changed

+17
-24
lines changed

3 files changed

+17
-24
lines changed

‎src/backend/parser/scan.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* A lexical scanner generated by flex */
22

33
/* Scanner skeleton version:
4-
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.6 1998/01/05 03:32:34 momjian Exp $
4+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.7 1998/01/13 19:28:29 scrappy Exp $
55
*/
66

77
#defineFLEX_SCANNER
@@ -539,7 +539,7 @@ char *yytext;
539539
*
540540
*
541541
* IDENTIFICATION
542-
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.6 1998/01/05 03:32:34 momjian Exp $
542+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.7 1998/01/13 19:28:29 scrappy Exp $
543543
*
544544
*-------------------------------------------------------------------------
545545
*/
@@ -954,7 +954,7 @@ YY_RULE_SETUP
954954
errno=0;
955955
yylval.ival=strtol((char*)literal,&endptr,2);
956956
if (*endptr!='\0'||errno==ERANGE)
957-
elog(ABORT,"Bad binary integer input '%s'",literal);
957+
elog(ERROR,"Bad binary integer input '%s'",literal);
958958
return (ICONST);
959959
}
960960
YY_BREAK
@@ -965,7 +965,7 @@ YY_RULE_SETUP
965965
#line 206 "scan.l"
966966
{
967967
if ((llen+yyleng)> (MAX_PARSE_BUFFER-1))
968-
elog(ABORT,"quoted string parse buffer of %d chars exceeded",MAX_PARSE_BUFFER);
968+
elog(ERROR,"quoted string parse buffer of %d chars exceeded",MAX_PARSE_BUFFER);
969969
memcpy(literal+llen,yytext,yyleng+1);
970970
llen+=yyleng;
971971
}
@@ -997,7 +997,7 @@ YY_RULE_SETUP
997997
errno=0;
998998
yylval.ival=strtol((char*)literal,&endptr,16);
999999
if (*endptr!='\0'||errno==ERANGE)
1000-
elog(ABORT,"Bad hexadecimal integer input '%s'",literal);
1000+
elog(ERROR,"Bad hexadecimal integer input '%s'",literal);
10011001
return (ICONST);
10021002
}
10031003
YY_BREAK
@@ -1026,7 +1026,7 @@ YY_RULE_SETUP
10261026
#line 243 "scan.l"
10271027
{
10281028
if ((llen+yyleng)> (MAX_PARSE_BUFFER-1))
1029-
elog(ABORT,"quoted string parse buffer of %d chars exceeded",MAX_PARSE_BUFFER);
1029+
elog(ERROR,"quoted string parse buffer of %d chars exceeded",MAX_PARSE_BUFFER);
10301030
memcpy(literal+llen,yytext,yyleng+1);
10311031
llen+=yyleng;
10321032
}
@@ -1036,7 +1036,7 @@ YY_RULE_SETUP
10361036
#line 249 "scan.l"
10371037
{
10381038
if ((llen+yyleng-1)> (MAX_PARSE_BUFFER-1))
1039-
elog(ABORT,"quoted string parse buffer of %d chars exceeded",MAX_PARSE_BUFFER);
1039+
elog(ERROR,"quoted string parse buffer of %d chars exceeded",MAX_PARSE_BUFFER);
10401040
memcpy(literal+llen,yytext,yyleng+1);
10411041
*(literal+llen)='\'';
10421042
llen+=yyleng;
@@ -1047,7 +1047,7 @@ YY_RULE_SETUP
10471047
#line 257 "scan.l"
10481048
{
10491049
if ((llen+yyleng-1)> (MAX_PARSE_BUFFER-1))
1050-
elog(ABORT,"quoted string parse buffer of %d chars exceeded",MAX_PARSE_BUFFER);
1050+
elog(ERROR,"quoted string parse buffer of %d chars exceeded",MAX_PARSE_BUFFER);
10511051
memcpy(literal+llen,yytext,yyleng+1);
10521052
llen+=yyleng;
10531053
}
@@ -1081,7 +1081,7 @@ YY_RULE_SETUP
10811081
#line 277 "scan.l"
10821082
{
10831083
if ((llen+yyleng)> (MAX_PARSE_BUFFER-1))
1084-
elog(ABORT,"quoted string parse buffer of %d chars exceeded",MAX_PARSE_BUFFER);
1084+
elog(ERROR,"quoted string parse buffer of %d chars exceeded",MAX_PARSE_BUFFER);
10851085
memcpy(literal+llen,yytext,yyleng+1);
10861086
llen+=yyleng;
10871087
}
@@ -1159,7 +1159,7 @@ YY_RULE_SETUP
11591159
errno=0;
11601160
yylval.ival=strtol((char*)yytext,&endptr,10);
11611161
if (*endptr!='\0'||errno==ERANGE)
1162-
elog(ABORT,"Bad integer input '%s'",yytext);
1162+
elog(ERROR,"Bad integer input '%s'",yytext);
11631163
return (ICONST);
11641164
}
11651165
YY_BREAK
@@ -1173,7 +1173,7 @@ YY_RULE_SETUP
11731173
errno=0;
11741174
yylval.dval=strtod(((char*)yytext),&endptr);
11751175
if (*endptr!='\0'||errno==ERANGE)
1176-
elog(ABORT,"Bad float8 input '%s'",yytext);
1176+
elog(ERROR,"Bad float8 input '%s'",yytext);
11771177
CheckFloat8Val(yylval.dval);
11781178
return (FCONST);
11791179
}
@@ -1187,7 +1187,7 @@ YY_RULE_SETUP
11871187
errno=0;
11881188
yylval.ival=strtol((char*)yytext,&endptr,10);
11891189
if (*endptr!='\0'||errno==ERANGE)
1190-
elog(ABORT,"Bad integer input '%s'",yytext);
1190+
elog(ERROR,"Bad integer input '%s'",yytext);
11911191
return (ICONST);
11921192
}
11931193
YY_BREAK
@@ -1200,7 +1200,7 @@ YY_RULE_SETUP
12001200
errno=0;
12011201
yylval.dval=strtod((char*)yytext,&endptr);
12021202
if (*endptr!='\0'||errno==ERANGE)
1203-
elog(ABORT,"Bad float input '%s'",yytext);
1203+
elog(ERROR,"Bad float input '%s'",yytext);
12041204
CheckFloat8Val(yylval.dval);
12051205
return (FCONST);
12061206
}
@@ -2133,7 +2133,7 @@ int main()
21332133

21342134
voidyyerror(charmessage[])
21352135
{
2136-
elog(ABORT,"parser: %s at or near \"%s\"",message,yytext);
2136+
elog(ERROR,"parser: %s at or near \"%s\"",message,yytext);
21372137
}
21382138

21392139
intyywrap()

‎src/backend/utils/adt/float.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.26 1998/01/05 16:39:59 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.27 1998/01/13 19:28:32 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -105,15 +105,8 @@ extern double rint(double x);
105105

106106
#endif
107107

108-
#ifndefHAVE_ISINF
109-
#defineisinf my_isinf
110-
staticintisinf(doublex);
111-
112-
#else
113108
externintisinf(doublex);
114109

115-
#endif
116-
117110
#endif
118111
/* ========== USER I/O ROUTINES ========== */
119112

‎src/include/storage/s_lock.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.15 1998/01/04 19:12:38 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.16 1998/01/13 19:28:39 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -117,7 +117,7 @@
117117
* Solaris 2
118118
*/
119119

120-
#if defined(i386_solaris)|| \
120+
#if(defined(__i386__)&& defined(__sun__))|| \
121121
defined(sparc_solaris)
122122
/* for xxxxx_solaris, this is defined in port/.../tas.s */
123123

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp