Mark exception and assert global variables as DLLIMPORT, so that plpgsql

tglsfdc · tglsfdc · commit 32924c1c9048 · 2001-03-23T18:26:01.000Z
can be compiled with asserts enabled on Windoze.
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.214 2001/03/22 06:16:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.215 2001/03/23 18:26:01 tgl Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -87,7 +87,7 @@ CommandDest whereToSendOutput = Debug;
 static bool dontExecute = false;
 
 /* note: these declarations had better match tcopprot.h */
-DLLIMPORT sigjmp_buf Warn_restart;
+sigjmp_buf	Warn_restart;
 
 bool		Warn_restart_ready = false;
 bool		InError = false;
@@ -1703,7 +1703,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.214 $ $Date: 2001/03/22 06:16:17 $\n");
+		puts("$Revision: 1.215 $ $Date: 2001/03/23 18:26:01 $\n");
 	}
 
 	/*
diff --git a/src/include/postgres.h b/src/include/postgres.h
@@ -10,7 +10,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1995, Regents of the University of California
  *
- * $Id: postgres.h,v 1.47 2001/03/22 04:00:25 momjian Exp $
+ * $Id: postgres.h,v 1.48 2001/03/23 18:26:01 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -453,11 +453,11 @@ typedef struct Exception
 	ExcMessage	message;
 } Exception;
 
-extern Exception FailedAssertion;
-extern Exception BadArg;
-extern Exception BadState;
+extern DLLIMPORT Exception FailedAssertion;
+extern DLLIMPORT Exception BadArg;
+extern DLLIMPORT Exception BadState;
 
-extern bool assert_enabled;
+extern DLLIMPORT bool assert_enabled;
 
 /*
  * USE_ASSERT_CHECKING, if defined, turns on all the assertions.
diff --git a/src/include/utils/excid.h b/src/include/utils/excid.h
@@ -7,22 +7,22 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: excid.h,v 1.9 2001/02/06 01:53:52 tgl Exp $
+ * $Id: excid.h,v 1.10 2001/03/23 18:26:01 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXCID_H
 #define EXCID_H
 
+/* note: these first three are also declared in postgres.h */
+extern DLLIMPORT Exception FailedAssertion;
+extern DLLIMPORT Exception BadState;
+extern DLLIMPORT Exception BadArg;
+extern DLLIMPORT Exception Unimplemented;
 
-extern Exception FailedAssertion;
-extern Exception BadState;
-extern Exception BadArg;
-extern Exception Unimplemented;
-
-extern Exception CatalogFailure;/* XXX inconsistent naming style */
-extern Exception InternalError; /* XXX inconsistent naming style */
-extern Exception SemanticError; /* XXX inconsistent naming style */
-extern Exception SystemError;	/* XXX inconsistent naming style */
+extern DLLIMPORT Exception CatalogFailure;/* XXX inconsistent naming style */
+extern DLLIMPORT Exception InternalError; /* XXX inconsistent naming style */
+extern DLLIMPORT Exception SemanticError; /* XXX inconsistent naming style */
+extern DLLIMPORT Exception SystemError;	/* XXX inconsistent naming style */
 
 #endif	 /* EXCID_H */

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* 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 $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -87,7 +87,7 @@ CommandDest whereToSendOutput = Debug;`
`87`	`87`	`static bool dontExecute = false;`
`88`	`88`
`89`	`89`	`/* note: these declarations had better match tcopprot.h */`
`90`		`-DLLIMPORT sigjmp_buf Warn_restart;`
	`90`	`+sigjmp_buf Warn_restart;`
`91`	`91`
`92`	`92`	`bool Warn_restart_ready = false;`
`93`	`93`	`bool InError = false;`
`@@ -1703,7 +1703,7 @@ PostgresMain(int argc, char argv[], int real_argc, char real_argv[], const cha`
`1703`	`1703`	`if (!IsUnderPostmaster)`
`1704`	`1704`	`{`
`1705`	`1705`	`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");`
`1707`	`1707`	`}`
`1708`	`1708`
`1709`	`1709`	`/*`