Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 495fe12

Browse files
author
Michael Meskes
committed
Hopefully fixed the long long problem.
1 parent 3ced3cf commit 495fe12

File tree

3 files changed

+32
-6
lines changed

3 files changed

+32
-6
lines changed

src/interfaces/ecpg/ChangeLog

+4
Original file line numberDiff line numberDiff line change
@@ -1067,5 +1067,9 @@ Thu Mar 29 10:23:05 CEST 2001
10671067
Mon Apr 2 10:16:10 CEST 2001
10681068

10691069
- Synced scan.l and pgc.l.
1070+
1071+
Thu Apr 5 10:11:35 CEST 2001
1072+
1073+
- Fixed long long problem.
10701074
- Set ecpg version to 2.8.0.
10711075
- Set library version to 3.2.0.

src/interfaces/ecpg/lib/typename.c

-2
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ ECPGtype_name(enum ECPGttype typ)
3131
return "long";
3232
case ECPGt_unsigned_long:
3333
return "unsigned long";
34-
#ifdef HAVE_LONG_LONG_INT_64
3534
case ECPGt_long_long:
3635
return "long long";
3736
case ECPGt_unsigned_long_long:
3837
return "unsigned long long";
39-
#endif /* HAVE_LONG_LONG_INT_64 */
4038
case ECPGt_float:
4139
return "float";
4240
case ECPGt_double:

src/interfaces/ecpg/preproc/preproc.y

+28-4
Original file line numberDiff line numberDiff line change
@@ -4251,8 +4251,20 @@ unsigned_type: SQL_UNSIGNED SQL_SHORT { $$ = ECPGt_unsigned_short; }
42514251
| SQL_UNSIGNED SQL_INT { $$ = ECPGt_unsigned_int; }
42524252
| SQL_UNSIGNED SQL_LONG { $$ = ECPGt_unsigned_long; }
42534253
| SQL_UNSIGNED SQL_LONG SQL_INT { $$ = ECPGt_unsigned_long; }
4254-
| SQL_UNSIGNED SQL_LONG SQL_LONG { $$ = ECPGt_unsigned_long_long; }
4255-
| SQL_UNSIGNED SQL_LONG SQL_LONG SQL_INT { $$ = ECPGt_unsigned_long_long; }
4254+
| SQL_UNSIGNED SQL_LONG SQL_LONG {
4255+
#ifdef HAVE_LONG_LONG_INT_64
4256+
$$ = ECPGt_unsigned_long_long;
4257+
#else
4258+
$$ = ECPGt_unsigned_long;
4259+
#endif
4260+
}
4261+
| SQL_UNSIGNED SQL_LONG SQL_LONG SQL_INT {
4262+
#ifdef HAVE_LONG_LONG_INT_64
4263+
$$ = ECPGt_unsigned_long_long;
4264+
#else
4265+
$$ = ECPGt_unsigned_long;
4266+
#endif
4267+
}
42564268
| SQL_UNSIGNED CHAR { $$ = ECPGt_unsigned_char; }
42574269
;
42584270

@@ -4261,8 +4273,20 @@ signed_type: SQL_SHORT { $$ = ECPGt_short; }
42614273
| SQL_INT { $$ = ECPGt_int; }
42624274
| SQL_LONG { $$ = ECPGt_long; }
42634275
| SQL_LONG SQL_INT { $$ = ECPGt_long; }
4264-
| SQL_LONG SQL_LONG { $$ = ECPGt_long_long; }
4265-
| SQL_LONG SQL_LONG SQL_INT { $$ = ECPGt_long; }
4276+
| SQL_LONG SQL_LONG {
4277+
#ifdef HAVE_LONG_LONG_INT_64
4278+
$$ = ECPGt_long_long;
4279+
#else
4280+
$$ = ECPGt_long;
4281+
#endif
4282+
}
4283+
| SQL_LONG SQL_LONG SQL_INT {
4284+
#ifdef HAVE_LONG_LONG_INT_64
4285+
$$ = ECPGt_long_long;
4286+
#else
4287+
$$ = ECPGt_long;
4288+
#endif
4289+
}
42664290
| SQL_BOOL { $$ = ECPGt_bool; };
42674291
| FLOAT { $$ = ECPGt_float; }
42684292
| DOUBLE { $$ = ECPGt_double; }

0 commit comments

Comments
 (0)