open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up local redeclarations of variables with DLLIMPORT, per report

Browse Source 
from Magnus that MSVC complains about this.
REL8_2_STABLE
Tom Lane 19 years ago
parent fd38d726a9
commit def651f48f
12 changed files with 27 additions and 50 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      contrib/adminpack/adminpack.c
  2. 7
      contrib/pg_buffercache/pg_buffercache_pages.c
  3. 9
      contrib/pg_freespacemap/pg_freespacemap.c
  4. 6
      src/backend/catalog/pg_proc.c
  5. 7
      src/backend/utils/misc/guc.c
  6. 8
      src/include/miscadmin.h
  7. 6
      src/include/postmaster/syslogger.h
  8. 4
      src/include/storage/buf_internals.h
  9. 6
      src/include/storage/freespace.h
  10. 6
      src/include/utils/guc.h
  11. 6
      src/pl/plperl/plperl.c
  12. 5
      src/pl/plpgsql/src/pl_handler.c

7
contrib/adminpack/adminpack.c
Unescape View File

@ -8,7 +8,7 @@
* Author: Andreas Pflug <pgadmin@pse-consulting.de>
*
* IDENTIFICATION
* $PostgreSQL: pgsql/contrib/adminpack/adminpack.c,v 1.5 2006/10/19 17:48:04 neilc Exp $
* $PostgreSQL: pgsql/contrib/adminpack/adminpack.c,v 1.6 2006/10/19 18:32:45 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -22,6 +22,7 @@
#include "miscadmin.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "postmaster/syslogger.h"
#include "storage/fd.h"
#include "utils/datetime.h"
@ -37,10 +38,6 @@
#endif
#endif
extern DLLIMPORT char *DataDir;
extern DLLIMPORT char *Log_directory;
extern DLLIMPORT char *Log_filename;
PG_MODULE_MAGIC;
Datum pg_file_write(PG_FUNCTION_ARGS);

7
contrib/pg_buffercache/pg_buffercache_pages.c vendored
Unescape View File

@ -3,7 +3,7 @@
* pg_buffercache_pages.c
* display some contents of the buffer cache
*
* $PostgreSQL: pgsql/contrib/pg_buffercache/pg_buffercache_pages.c,v 1.9 2006/10/04 00:29:45 momjian Exp $
* $PostgreSQL: pgsql/contrib/pg_buffercache/pg_buffercache_pages.c,v 1.10 2006/10/19 18:32:46 tgl Exp $
*-------------------------------------------------------------------------
*/
#include "postgres.h"
@ -16,11 +16,6 @@
#define NUM_BUFFERCACHE_PAGES_ELEM 6
#if defined(WIN32) || defined(__CYGWIN__)
extern DLLIMPORT BufferDesc *BufferDescriptors;
extern DLLIMPORT volatile uint32 InterruptHoldoffCount;
#endif
PG_MODULE_MAGIC;
Datum pg_buffercache_pages(PG_FUNCTION_ARGS);

9
contrib/pg_freespacemap/pg_freespacemap.c
Unescape View File

@ -3,7 +3,7 @@
* pg_freespacemap.c
* display some contents of the free space relation and page maps.
*
* $PostgreSQL: pgsql/contrib/pg_freespacemap/pg_freespacemap.c,v 1.8 2006/10/04 00:29:45 momjian Exp $
* $PostgreSQL: pgsql/contrib/pg_freespacemap/pg_freespacemap.c,v 1.9 2006/10/19 18:32:46 tgl Exp $
*-------------------------------------------------------------------------
*/
#include "postgres.h"
@ -17,13 +17,6 @@
#define NUM_FREESPACE_PAGES_ELEM 5
#define NUM_FREESPACE_RELATIONS_ELEM 7
#if defined(WIN32) || defined(__CYGWIN__)
/* Need DLLIMPORT for some things that are not so marked in main headers */
extern DLLIMPORT int MaxFSMPages;
extern DLLIMPORT int MaxFSMRelations;
extern DLLIMPORT volatile uint32 InterruptHoldoffCount;
#endif
PG_MODULE_MAGIC;
Datum pg_freespacemap_pages(PG_FUNCTION_ARGS);

6
src/backend/catalog/pg_proc.c
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.140 2006/07/13 16:49:13 momjian Exp $
* $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.141 2006/10/19 18:32:46 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -35,10 +35,6 @@
#include "utils/syscache.h"
/* GUC parameter */
bool check_function_bodies = true;
Datum fmgr_internal_validator(PG_FUNCTION_ARGS);
Datum fmgr_c_validator(PG_FUNCTION_ARGS);
Datum fmgr_sql_validator(PG_FUNCTION_ARGS);

7
src/backend/utils/misc/guc.c
Unescape View File

@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.356 2006/10/07 19:25:28 tgl Exp $
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.357 2006/10/19 18:32:47 tgl Exp $
*
*--------------------------------------------------------------------
*/
@ -93,7 +93,6 @@
/* XXX these should appear in other modules' header files */
extern bool Log_disconnections;
extern bool check_function_bodies;
extern int CommitDelay;
extern int CommitSiblings;
extern char *default_tablespace;
@ -171,12 +170,12 @@ bool log_statement_stats = false; /* this is sort of all three
* above together */
bool log_btree_build_stats = false;
bool check_function_bodies = true;
bool default_with_oids = false;
bool SQL_inheritance = true;
bool Password_encryption = true;
bool default_with_oids = false;
int log_min_error_statement = PANIC;
int log_min_messages = NOTICE;
int client_min_messages = NOTICE;

8
src/include/miscadmin.h
Unescape View File

@ -13,7 +13,7 @@
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.189 2006/09/04 15:07:46 petere Exp $
* $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.190 2006/10/19 18:32:47 tgl Exp $
*
* NOTES
* some of the information in this file should be moved to other files.
@ -70,8 +70,8 @@ extern volatile bool ProcDiePending;
/* these are marked volatile because they are examined by signal handlers: */
extern volatile bool ImmediateInterruptOK;
extern volatile uint32 InterruptHoldoffCount;
extern volatile uint32 CritSectionCount;
extern DLLIMPORT volatile uint32 InterruptHoldoffCount;
extern DLLIMPORT volatile uint32 CritSectionCount;
/* in tcop/postgres.c */
extern void ProcessInterrupts(void);
@ -125,7 +125,7 @@ extern bool IsUnderPostmaster;
extern bool ExitOnAnyError;
extern char *DataDir;
extern DLLIMPORT char *DataDir;
extern DLLIMPORT int NBuffers;
extern int MaxBackends;

6
src/include/postmaster/syslogger.h
Unescape View File

@ -5,7 +5,7 @@
*
* Copyright (c) 2004-2006, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/include/postmaster/syslogger.h,v 1.6 2006/03/05 15:58:58 momjian Exp $
* $PostgreSQL: pgsql/src/include/postmaster/syslogger.h,v 1.7 2006/10/19 18:32:47 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -16,8 +16,8 @@
extern bool Redirect_stderr;
extern int Log_RotationAge;
extern int Log_RotationSize;
extern char *Log_directory;
extern char *Log_filename;
extern DLLIMPORT char *Log_directory;
extern DLLIMPORT char *Log_filename;
extern bool Log_truncate_on_rotation;
extern bool am_syslogger;

4
src/include/storage/buf_internals.h
Unescape View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/include/storage/buf_internals.h,v 1.87 2006/07/23 03:07:58 tgl Exp $
* $PostgreSQL: pgsql/src/include/storage/buf_internals.h,v 1.88 2006/10/19 18:32:47 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -162,7 +162,7 @@ typedef struct sbufdesc
/* in buf_init.c */
extern BufferDesc *BufferDescriptors;
extern DLLIMPORT BufferDesc *BufferDescriptors;
/* in localbuf.c */
extern BufferDesc *LocalBufferDescriptors;

6
src/include/storage/freespace.h
Unescape View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/include/storage/freespace.h,v 1.23 2006/10/04 00:30:10 momjian Exp $
* $PostgreSQL: pgsql/src/include/storage/freespace.h,v 1.24 2006/10/19 18:32:47 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -124,8 +124,8 @@ struct FSMRelation
/* GUC variables */
extern int MaxFSMRelations;
extern int MaxFSMPages;
extern DLLIMPORT int MaxFSMRelations;
extern DLLIMPORT int MaxFSMPages;
/*

6
src/include/utils/guc.h
Unescape View File

@ -7,7 +7,7 @@
* Copyright (c) 2000-2006, PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.75 2006/08/14 02:27:27 momjian Exp $
* $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.76 2006/10/19 18:32:47 tgl Exp $
*--------------------------------------------------------------------
*/
#ifndef GUC_H
@ -115,9 +115,9 @@ extern bool log_executor_stats;
extern bool log_statement_stats;
extern bool log_btree_build_stats;
extern bool SQL_inheritance;
extern DLLIMPORT bool check_function_bodies;
extern bool default_with_oids;
extern bool SQL_inheritance;
extern int log_min_error_statement;
extern int log_min_messages;

6
src/pl/plperl/plperl.c
Unescape View File

@ -1,7 +1,7 @@
/**********************************************************************
* plperl.c - perl as a procedural language for PostgreSQL
*
* $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.120 2006/10/15 18:56:39 tgl Exp $
* $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.121 2006/10/19 18:32:47 tgl Exp $
*
**********************************************************************/
@ -23,13 +23,11 @@
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "parser/parse_type.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/typcache.h"
/* define this before the perl headers get a chance to mangle DLLIMPORT */
extern DLLIMPORT bool check_function_bodies;
/* perl stuff */
#include "plperl.h"

5
src/pl/plpgsql/src/pl_handler.c
Unescape View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_handler.c,v 1.32 2006/10/04 00:30:13 momjian Exp $
* $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_handler.c,v 1.33 2006/10/19 18:32:48 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -21,11 +21,10 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
extern DLLIMPORT bool check_function_bodies;
PG_MODULE_MAGIC;
PLpgSQL_plugin **plugin_ptr = NULL;

Write Preview
Loading…
Cancel
Save