diff options
| author | Magnus Hagander <magnus@hagander.net> | 2007-07-25 12:22:54 +0000 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2007-07-25 12:22:54 +0000 |
| commit | 906b2e1b37d351fd54f4bcfd66167e14dbb51818 (patch) | |
| tree | c719d29366902e246d72dbee73790dc5647f3005 /src/include/optimizer | |
| parent | 5cbb11928eef89df5993940eef6a35ceca5d67a3 (diff) | |
Rename DLLIMPORT macro to PGDLLIMPORT to avoid conflict with
third party includes (like tcl) that define DLLIMPORT.
Diffstat (limited to 'src/include/optimizer')
| -rw-r--r-- | src/include/optimizer/cost.h | 14 | ||||
| -rw-r--r-- | src/include/optimizer/plancat.h | 4 | ||||
| -rw-r--r-- | src/include/optimizer/planner.h | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index 138741e07a8..dc052dcf55f 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/cost.h,v 1.87 2007/05/21 17:57:34 tgl Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/cost.h,v 1.88 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -36,12 +36,12 @@ */ /* parameter variables and flags */ -extern DLLIMPORT double seq_page_cost; -extern DLLIMPORT double random_page_cost; -extern DLLIMPORT double cpu_tuple_cost; -extern DLLIMPORT double cpu_index_tuple_cost; -extern DLLIMPORT double cpu_operator_cost; -extern DLLIMPORT int effective_cache_size; +extern PGDLLIMPORT double seq_page_cost; +extern PGDLLIMPORT double random_page_cost; +extern PGDLLIMPORT double cpu_tuple_cost; +extern PGDLLIMPORT double cpu_index_tuple_cost; +extern PGDLLIMPORT double cpu_operator_cost; +extern PGDLLIMPORT int effective_cache_size; extern Cost disable_cost; extern bool enable_seqscan; extern bool enable_indexscan; diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index a19ba780eed..0d2a075caf6 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/plancat.h,v 1.44 2007/05/25 17:54:25 tgl Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/plancat.h,v 1.45 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ typedef void (*get_relation_info_hook_type) (PlannerInfo *root, Oid relationObjectId, bool inhparent, RelOptInfo *rel); -extern DLLIMPORT get_relation_info_hook_type get_relation_info_hook; +extern PGDLLIMPORT get_relation_info_hook_type get_relation_info_hook; extern void get_relation_info(PlannerInfo *root, Oid relationObjectId, diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h index a08a83ae718..337cca002eb 100644 --- a/src/include/optimizer/planner.h +++ b/src/include/optimizer/planner.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/planner.h,v 1.40 2007/05/25 17:54:25 tgl Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/planner.h,v 1.41 2007/07/25 12:22:53 mha Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,7 @@ typedef PlannedStmt * (*planner_hook_type) (Query *parse, int cursorOptions, ParamListInfo boundParams); -extern DLLIMPORT planner_hook_type planner_hook; +extern PGDLLIMPORT planner_hook_type planner_hook; extern PlannedStmt *planner(Query *parse, int cursorOptions, |