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

Commit 32924c1

Browse files
committed
Mark exception and assert global variables as DLLIMPORT, so that plpgsql
can be compiled with asserts enabled on Windoze.
1 parent aba61c5 commit 32924c1

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

src/backend/tcop/postgres.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.214 2001/03/22 06:16:17 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.215 2001/03/23 18:26:01 tgl Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -87,7 +87,7 @@ CommandDest whereToSendOutput = Debug;
8787
static bool dontExecute = false;
8888

8989
/* note: these declarations had better match tcopprot.h */
90-
DLLIMPORT sigjmp_buf Warn_restart;
90+
sigjmp_buf Warn_restart;
9191

9292
bool Warn_restart_ready = false;
9393
bool InError = false;
@@ -1703,7 +1703,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
17031703
if (!IsUnderPostmaster)
17041704
{
17051705
puts("\nPOSTGRES backend interactive interface ");
1706-
puts("$Revision: 1.214 $ $Date: 2001/03/22 06:16:17 $\n");
1706+
puts("$Revision: 1.215 $ $Date: 2001/03/23 18:26:01 $\n");
17071707
}
17081708

17091709
/*

src/include/postgres.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
1111
* Portions Copyright (c) 1995, Regents of the University of California
1212
*
13-
* $Id: postgres.h,v 1.47 2001/03/22 04:00:25 momjian Exp $
13+
* $Id: postgres.h,v 1.48 2001/03/23 18:26:01 tgl Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -453,11 +453,11 @@ typedef struct Exception
453453
ExcMessage message;
454454
} Exception;
455455

456-
extern Exception FailedAssertion;
457-
extern Exception BadArg;
458-
extern Exception BadState;
456+
extern DLLIMPORT Exception FailedAssertion;
457+
extern DLLIMPORT Exception BadArg;
458+
extern DLLIMPORT Exception BadState;
459459

460-
extern bool assert_enabled;
460+
extern DLLIMPORT bool assert_enabled;
461461

462462
/*
463463
* USE_ASSERT_CHECKING, if defined, turns on all the assertions.

src/include/utils/excid.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: excid.h,v 1.9 2001/02/06 01:53:52 tgl Exp $
10+
* $Id: excid.h,v 1.10 2001/03/23 18:26:01 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#ifndef EXCID_H
1515
#define EXCID_H
1616

17+
/* note: these first three are also declared in postgres.h */
18+
extern DLLIMPORT Exception FailedAssertion;
19+
extern DLLIMPORT Exception BadState;
20+
extern DLLIMPORT Exception BadArg;
21+
extern DLLIMPORT Exception Unimplemented;
1722

18-
extern Exception FailedAssertion;
19-
extern Exception BadState;
20-
extern Exception BadArg;
21-
extern Exception Unimplemented;
22-
23-
extern Exception CatalogFailure;/* XXX inconsistent naming style */
24-
extern Exception InternalError; /* XXX inconsistent naming style */
25-
extern Exception SemanticError; /* XXX inconsistent naming style */
26-
extern Exception SystemError; /* XXX inconsistent naming style */
23+
extern DLLIMPORT Exception CatalogFailure;/* XXX inconsistent naming style */
24+
extern DLLIMPORT Exception InternalError; /* XXX inconsistent naming style */
25+
extern DLLIMPORT Exception SemanticError; /* XXX inconsistent naming style */
26+
extern DLLIMPORT Exception SystemError; /* XXX inconsistent naming style */
2727

2828
#endif /* EXCID_H */

0 commit comments

Comments
 (0)