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

Commitb9b00d5

Browse files
committed
From: Michael Meskes <meskes@online-club.de>This one is against the current archive (so it contains the one I send theother day). It should fix the AIX problems. Andreas, could you please tryit? Thanks.+ Wed Aug 26 16:17:39 CEST 1998++ - Sync preproc.y with gram.y++ Thu Aug 27 15:32:23 CEST 1998++ - Fix some minor glitches that the AIX compiler complains about+ - Added patchlevel to library++ Fri Aug 28 15:36:58 CEST 1998++ - Removed one line of code that AIX complains about since it was not+ needed anyway+ - Set library version to 2.6.1
1 parent013184c commitb9b00d5

File tree

4 files changed

+26
-7
lines changed

4 files changed

+26
-7
lines changed

‎src/interfaces/ecpg/ChangeLog

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,3 +297,17 @@ Thu Aug 20 15:31:29 CEST 1998
297297
- Cleaned up memory allocation in ecpglib.c
298298
- Set library version to 2.6
299299

300+
Wed Aug 26 16:17:39 CEST 1998
301+
302+
- Sync preproc.y with gram.y
303+
304+
Thu Aug 27 15:32:23 CEST 1998
305+
306+
- Fix some minor glitches that the AIX compiler complains about
307+
- Added patchlevel to library
308+
309+
Fri Aug 28 15:36:58 CEST 1998
310+
311+
- Removed one line of code that AIX complains about since it was not
312+
needed anyway
313+
- Set library version to 2.6.1

‎src/interfaces/ecpg/lib/Makefile.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PQ_INCLUDE=-I$(SRCDIR)/interfaces/libpq
55

66
SO_MAJOR_VERSION=2
77
SO_MINOR_VERSION=6
8+
SO_PATCHLEVEL=1
89

910
PORTNAME=@PORTNAME@
1011

@@ -19,21 +20,21 @@ ifeq ($(PORTNAME), linux)
1920
LINUX_ELF=@LINUX_ELF@
2021
ifdef LINUX_ELF
2122
install-shlib-dep := install-shlib
22-
shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
23+
shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
2324
LDFLAGS_SL = -shared -soname libecpg.so.$(SO_MAJOR_VERSION)
2425
endif
2526
endif
2627
ifeq ($(PORTNAME), bsd)
2728
ifdef BSD_SHLIB
2829
install-shlib-dep := install-shlib
29-
shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
30+
shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
3031
LDFLAGS_SL = -x -Bshareable -Bforcearchive
3132
CFLAGS +=$(CFLAGS_SL)
3233
endif
3334
endif
3435
#ifeq ($(PORTNAME), solaris)
3536
# install-shlib-dep := install-shlib
36-
# shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
37+
# shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
3738
# LDFLAGS_SL = -G -z text
3839
# CFLAGS += $(CFLAGS_SL)
3940
#endif

‎src/interfaces/ecpg/lib/ecpglib.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ ECPGexecute(struct statement *stmt)
701701
}
702702
else
703703
{
704-
strncpy((char*) (var->value+var->offset*act_tuple),pval,var->varcharsize);
704+
strncpy((char*) ((long)var->value+var->offset*act_tuple),pval,var->varcharsize);
705705
if (var->varcharsize<strlen(pval))
706706
{
707707
/* truncation */
@@ -731,7 +731,7 @@ ECPGexecute(struct statement *stmt)
731731
caseECPGt_varchar:
732732
{
733733
structECPGgeneric_varchar*variable=
734-
(structECPGgeneric_varchar*) (var->value+var->offset*act_tuple);
734+
(structECPGgeneric_varchar*) ((long)var->value+var->offset*act_tuple);
735735

736736
if (var->varcharsize==0)
737737
strncpy(variable->arr,pval,strlen(pval));
@@ -828,7 +828,6 @@ ECPGexecute(struct statement *stmt)
828828
free(notify);
829829
}
830830

831-
va_end(ap);
832831
returnstatus;
833832
}
834833

‎src/interfaces/ecpg/preproc/preproc.y

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ output_statement(char * stmt, int mode)
566566
LANCOMPILER,LISTEN,UNLISTEN,LOAD,LOCK_P,LOCATION,MAXVALUE,MINVALUE,MOVE,
567567
NEW,NONE,NOTHING,NOTNULL,OIDS,OPERATOR,PROCEDURAL,
568568
RECIPE,RENAME,RESET,RETURNS,ROW,RULE,
569-
SEQUENCE,SETOF,SHOW,START,STATEMENT,STDIN,STDOUT,TRUSTED,
569+
SERIAL,SEQUENCE,SETOF,SHOW,START,STATEMENT,STDIN,STDOUT,TRUSTED,
570570
VACUUM,VERBOSE,VERSION,ENCODING
571571

572572
/* Keywords (obsolete; retain through next version for parser - thomas 1997-12-0 4)*/
@@ -1083,6 +1083,10 @@ columnDef: ColId Typename ColQualifier
10831083
{
10841084
$$ = cat3_str($1,$2,$3);
10851085
}
1086+
|ColIdSERIAL
1087+
{
1088+
$$ = make2_str($1, make1_str(" serial"));
1089+
}
10861090
;
10871091

10881092
ColQualifier:ColQualList{$$ =$1; }
@@ -3795,6 +3799,7 @@ ColId: ident{ $$ = $1; }
37953799
|PRIVILEGES{$$ = make1_str("privileges"); }
37963800
|RECIPE{$$ = make1_str("recipe"); }
37973801
|ROW{$$ = make1_str("row"); }
3802+
|SERIAL{$$ = make1_str("serial"); }
37983803
|START{$$ = make1_str("start"); }
37993804
|STATEMENT{$$ = make1_str("statement"); }
38003805
|TIME{$$ = make1_str("time"); }

0 commit comments

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