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

Commit90bfe99

Browse files
committed
Do not build psql's flex module on its own, but instead include it in
mainloop.c. This ensures that postgres_fe.h is read before includingany system headers, which is necessary to avoid problems on some platformswhere we make nondefault selections of feature macros for stdio.h orother headers. We have had this policy for flex modules in the backendfor many years, but for some reason it was not applied to psql.Per trouble report from Alexandra Roy and diagnosis by Albe Laurenz.
1 parent21e3edd commit90bfe99

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

‎src/bin/psql/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.66 2009/09/18 05:00:42 petere Exp $
8+
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.67 2009/11/10 23:12:13 tgl Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -21,7 +21,7 @@ override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) -I$(top_srcdir)/src/bin/p
2121

2222
OBJS=command.o common.o help.o input.o stringutils.o mainloop.o copy.o\
2323
startup.o prompt.o variables.o large_obj.o print.o describe.o\
24-
psqlscan.otab-complete.o mbprint.o dumputils.o keywords.o kwlookup.o\
24+
tab-complete.o mbprint.o dumputils.o keywords.o kwlookup.o\
2525
sql_help.o\
2626
$(WIN32RES)
2727

@@ -45,6 +45,9 @@ sql_help.c: sql_help.h ;
4545
sql_help.h: create_help.pl$(wildcard$(REFDOCDIR)/*.sgml)
4646
$(PERL)$<$(REFDOCDIR)$*
4747

48+
# psqlscan is compiled as part of mainloop
49+
mainloop.o: psqlscan.c
50+
4851
psqlscan.c: psqlscan.l
4952
ifdefFLEX
5053
$(FLEX) $(FLEXFLAGS) -o'$@' $<

‎src/bin/psql/mainloop.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2009, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.95 2009/06/11 14:49:08 momjian Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.96 2009/11/10 23:12:13 tgl Exp $
77
*/
88
#include"postgres_fe.h"
99
#include"mainloop.h"
@@ -407,3 +407,13 @@ MainLoop(FILE *source)
407407

408408
returnsuccessResult;
409409
}/* MainLoop() */
410+
411+
412+
/*
413+
* psqlscan.c is #include'd here instead of being compiled on its own.
414+
* This is because we need postgres_fe.h to be read before any system
415+
* include files, else things tend to break on platforms that have
416+
* multiple infrastructures for stdio.h and so on. flex is absolutely
417+
* uncooperative about that, so we can't compile psqlscan.c on its own.
418+
*/
419+
#include"psqlscan.c"

0 commit comments

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