Revert "Change most instances of PGDLLIMPORT hooks to PGDLLEXPORT hoo…

…ks so that they can be consumed by the Babelfish extension"

This reverts commit 17b2089, except for
in scanner.h, where the core_yylex_hook still needs to be declared
PGDLLEXPORT (or else there will be a server crash).

src/include/access/attmap.h

@@ -51,6 +51,6 @@ extern AttrMap *build_attrmap_by_position(TupleDesc indesc,
 										  TupleDesc outdesc,
 										  const char *msg);
 typedef bool (*called_from_tsql_insert_exec_hook_type)();
-extern PGDLLEXPORT called_from_tsql_insert_exec_hook_type called_from_tsql_insert_exec_hook;
+extern PGDLLIMPORT called_from_tsql_insert_exec_hook_type called_from_tsql_insert_exec_hook;
 
 #endif							/* ATTMAP_H */

src/include/access/heapam.h

@@ -202,19 +202,19 @@ typedef struct HeapPageFreeze
 /* Hook for plugins to get control with visibility without providing a separate AM */
 typedef bool (*table_variable_satisfies_visibility_hook_type) (
 	HeapTuple stup, Snapshot snapshot, Buffer buffer);
-extern PGDLLEXPORT table_variable_satisfies_visibility_hook_type table_variable_satisfies_visibility_hook;
+extern PGDLLIMPORT table_variable_satisfies_visibility_hook_type table_variable_satisfies_visibility_hook;
 
 typedef TM_Result (*table_variable_satisfies_update_hook_type) (
 	HeapTuple stup, CommandId curcid, Buffer buffer);
-extern PGDLLEXPORT table_variable_satisfies_update_hook_type table_variable_satisfies_update_hook;
+extern PGDLLIMPORT table_variable_satisfies_update_hook_type table_variable_satisfies_update_hook;
 
 typedef HTSV_Result (*table_variable_satisfies_vacuum_hook_type) (
 	HeapTuple stup, TransactionId OldestXmin, Buffer buffer);
-extern PGDLLEXPORT table_variable_satisfies_vacuum_hook_type table_variable_satisfies_vacuum_hook;
+extern PGDLLIMPORT table_variable_satisfies_vacuum_hook_type table_variable_satisfies_vacuum_hook;
 
 typedef HTSV_Result (*table_variable_satisfies_vacuum_horizon_hook_type) (
 	HeapTuple htup, Buffer buffer, TransactionId *dead_after);
-extern PGDLLEXPORT table_variable_satisfies_vacuum_horizon_hook_type table_variable_satisfies_vacuum_horizon_hook;
+extern PGDLLIMPORT table_variable_satisfies_vacuum_horizon_hook_type table_variable_satisfies_vacuum_horizon_hook;
 
 /*
  * HeapScanIsValid

src/include/access/transam.h

@@ -296,7 +296,7 @@ extern Oid	GetNewObjectId(void);
 extern void StopGeneratingPinnedObjectIds(void);
 
 typedef void (*GetNewObjectId_hook_type) (VariableCache variableCache);
-extern PGDLLEXPORT GetNewObjectId_hook_type GetNewObjectId_hook;
+extern PGDLLIMPORT GetNewObjectId_hook_type GetNewObjectId_hook;
 
 #ifdef USE_ASSERT_CHECKING
 extern void AssertTransactionIdInAllowableRange(TransactionId xid);

src/include/access/tupconvert.h

@@ -54,7 +54,7 @@ extern void free_conversion_map(TupleConversionMap *map);
 typedef Datum (*exec_tsql_cast_value_hook_type)(Datum value, bool *isnull,
 							 Oid valtype, int32 valtypmod,
 							 Oid reqtype, int32 reqtypmod);
-extern PGDLLEXPORT exec_tsql_cast_value_hook_type exec_tsql_cast_value_hook;
+extern PGDLLIMPORT exec_tsql_cast_value_hook_type exec_tsql_cast_value_hook;
 
 
 #endif							/* TUPCONVERT_H */

src/include/access/xact.h

@@ -527,13 +527,13 @@ extern void EnterParallelMode(void);
 extern void ExitParallelMode(void);
 extern bool IsInParallelMode(void);
 
-extern PGDLLEXPORT bool IsTopTransactionName(const char *name);
-extern PGDLLEXPORT void SetTopTransactionName(const char *name);
-extern PGDLLEXPORT bool IsTransactionBlockActive(void);
-extern PGDLLEXPORT void RollbackAndReleaseSavepoint(const char *name);
+extern bool IsTopTransactionName(const char *name);
+extern void SetTopTransactionName(const char *name);
+extern bool IsTransactionBlockActive(void);
+extern void RollbackAndReleaseSavepoint(const char *name);
 
 /* Nested transaction count */
-extern PGDLLEXPORT uint32 NestedTranCount;
-extern PGDLLEXPORT bool AbortCurTransaction;
+extern uint32 NestedTranCount;
+extern bool AbortCurTransaction;
 
 #endif							/* XACT_H */

src/include/catalog/catalog.h

@@ -43,12 +43,12 @@ extern RelFileNumber GetNewRelFileNumber(Oid reltablespace,
 										 char relpersistence);
 
 typedef bool (*IsExtendedCatalogHookType) (Oid relationId);
-extern PGDLLEXPORT IsExtendedCatalogHookType IsExtendedCatalogHook;
+extern IsExtendedCatalogHookType IsExtendedCatalogHook;
 
 typedef bool (*IsToastRelationHookType) (Relation relation);
-extern PGDLLEXPORT IsToastRelationHookType IsToastRelationHook;
+extern IsToastRelationHookType IsToastRelationHook;
 
 typedef bool (*IsToastClassHookType) (Form_pg_class pg_class_tup);
-extern PGDLLEXPORT IsToastClassHookType IsToastClassHook;
+extern IsToastClassHookType IsToastClassHook;
 
 #endif							/* CATALOG_H */

src/include/catalog/heap.h

@@ -161,9 +161,9 @@ extern void StorePartitionBound(Relation rel, Relation parent,
 
 /* Hook for plugins to transform executable expressions in check constraint clause */
 typedef Node* (*transform_check_constraint_expr_hook_type) (Node *node);
-extern PGDLLEXPORT transform_check_constraint_expr_hook_type transform_check_constraint_expr_hook;
+extern PGDLLIMPORT transform_check_constraint_expr_hook_type transform_check_constraint_expr_hook;
 
 typedef void (*drop_relation_refcnt_hook_type) (Relation rel);
-extern PGDLLEXPORT drop_relation_refcnt_hook_type drop_relation_refcnt_hook;
+extern PGDLLIMPORT drop_relation_refcnt_hook_type drop_relation_refcnt_hook;
 
 #endif							/* HEAP_H */

src/include/catalog/namespace.h

@@ -82,13 +82,13 @@ typedef void (*RangeVarGetRelidCallback) (const RangeVar *relation, Oid relId,
  * Hook for additional temporary relation lookup
  */
 typedef Oid (*relname_lookup_hook_type) (const char *relname, Oid relnamespace);
-extern PGDLLEXPORT relname_lookup_hook_type relname_lookup_hook;
+extern PGDLLIMPORT relname_lookup_hook_type relname_lookup_hook;
 typedef bool (*match_pltsql_func_call_hook_type) (HeapTuple proctup, int nargs, List *argnames,
 												  bool include_out_arguments, int **argnumbers,
 												  List **defaults, bool expand_defaults, bool expand_variadic,
 												  bool *use_defaults, bool *any_special,
 												  bool *variadic, Oid *va_elem_type);
-extern PGDLLEXPORT match_pltsql_func_call_hook_type match_pltsql_func_call_hook;
+extern PGDLLIMPORT match_pltsql_func_call_hook_type match_pltsql_func_call_hook;
 
 #define RangeVarGetRelid(relation, lockmode, missing_ok) \
 	RangeVarGetRelidExtended(relation, lockmode, \
@@ -108,7 +108,7 @@ extern bool RelationIsVisible(Oid relid);
 
 extern Oid	TypenameGetTypid(const char *typname);
 extern Oid	TypenameGetTypidExtended(const char *typname, bool temp_ok);
-extern PGDLLEXPORT Oid	typenameGetSchemaOID(const char *typname, bool temp_ok);
+extern Oid	typenameGetSchemaOID(const char *typname, bool temp_ok);
 extern bool TypeIsVisible(Oid typid);
 
 extern FuncCandidateList FuncnameGetCandidates(List *names,

src/include/catalog/objectaccess.h

@@ -137,7 +137,7 @@ typedef void (*object_access_hook_type_str) (ObjectAccessType access,
 											 void *arg);
 
 /* Plugin sets this variable to a suitable hook function. */
-extern PGDLLEXPORT object_access_hook_type object_access_hook;
+extern PGDLLIMPORT object_access_hook_type object_access_hook;
 extern PGDLLIMPORT object_access_hook_type_str object_access_hook_str;
 
 

src/include/catalog/objectaddress.h

@@ -87,6 +87,6 @@ extern struct ArrayType *strlist_to_textarray(List *list);
 extern ObjectType get_relkind_objtype(char relkind);
 
 typedef ObjectAddress (*get_trigger_object_address_hook_type)(List *object, Relation *relp, bool missing_ok,bool object_from_input);
-extern PGDLLEXPORT get_trigger_object_address_hook_type get_trigger_object_address_hook;
+extern PGDLLIMPORT get_trigger_object_address_hook_type get_trigger_object_address_hook;
 
 #endif							/* OBJECTADDRESS_H */

src/include/catalog/pg_collation.h

@@ -100,23 +100,23 @@ extern Oid CLUSTER_COLLATION_OID(void);
 
 /* Hook for plugins to get control in CLUSTER_COLLATION_OID() */
 typedef Oid (*CLUSTER_COLLATION_OID_hook_type)(void);
-extern PGDLLEXPORT CLUSTER_COLLATION_OID_hook_type CLUSTER_COLLATION_OID_hook;
+extern PGDLLIMPORT CLUSTER_COLLATION_OID_hook_type CLUSTER_COLLATION_OID_hook;
 
 typedef void (*PreCreateCollation_hook_type) (char collprovider,
 											  bool collisdeterministic,
 											  int32 collencoding,
 											  const char **collcollate,  /* The pointer may be modified */
 											  const char **collctype,    /* The pointer may be modified */
 											  const char *collversion);
-extern PGDLLEXPORT PreCreateCollation_hook_type PreCreateCollation_hook;
+extern PGDLLIMPORT PreCreateCollation_hook_type PreCreateCollation_hook;
 
 typedef const char * (*TranslateCollation_hook_type) (const char *collname, Oid collnamespace, int32 encoding);
-extern PGDLLEXPORT TranslateCollation_hook_type TranslateCollation_hook;
+extern PGDLLIMPORT TranslateCollation_hook_type TranslateCollation_hook;
 
 typedef void (*set_like_collation_hook_type) (Oid collation);
-extern PGDLLEXPORT set_like_collation_hook_type set_like_collation_hook;
+extern PGDLLIMPORT set_like_collation_hook_type set_like_collation_hook;
 
 typedef Oid (*get_like_collation_hook_type) (void);
-extern PGDLLEXPORT get_like_collation_hook_type get_like_collation_hook;
+extern PGDLLIMPORT get_like_collation_hook_type get_like_collation_hook;
 
 #endif							/* PG_COLLATION_H */

src/include/commands/copy.h

@@ -101,8 +101,8 @@ extern List *CopyGetAttnums(TupleDesc tupDesc, Relation rel,
 							List *attnamelist);
 
 typedef bool (*is_tsql_rowversion_or_timestamp_datatype_hook_type)(Oid oid);
-extern PGDLLEXPORT is_tsql_rowversion_or_timestamp_datatype_hook_type is_tsql_rowversion_or_timestamp_datatype_hook;
+extern PGDLLIMPORT is_tsql_rowversion_or_timestamp_datatype_hook_type is_tsql_rowversion_or_timestamp_datatype_hook;
 typedef void (*fill_missing_values_in_copyfrom_hook_type)(Relation rel, Datum *values, bool *nulls);
-extern PGDLLEXPORT fill_missing_values_in_copyfrom_hook_type fill_missing_values_in_copyfrom_hook;
+extern PGDLLIMPORT fill_missing_values_in_copyfrom_hook_type fill_missing_values_in_copyfrom_hook;
 
 #endif							/* COPY_H */

src/include/commands/defrem.h

@@ -78,8 +78,8 @@ extern void interpret_function_parameter_list(ParseState *pstate,
 
 typedef bool (*check_lang_as_clause_hook_type)(const char *lang, List *as, char **prosrc_str_p, char **probin_str_p);
 typedef void (*write_stored_proc_probin_hook_type)(CreateFunctionStmt *stmt, Oid languageOid, char** probin_str_p);
-extern PGDLLEXPORT check_lang_as_clause_hook_type check_lang_as_clause_hook;
-extern PGDLLEXPORT write_stored_proc_probin_hook_type write_stored_proc_probin_hook;
+extern PGDLLIMPORT check_lang_as_clause_hook_type check_lang_as_clause_hook;
+extern PGDLLIMPORT write_stored_proc_probin_hook_type write_stored_proc_probin_hook;
 
 /* commands/operatorcmds.c */
 extern ObjectAddress DefineOperator(List *names, List *parameters);

src/include/commands/sequence.h

@@ -26,7 +26,7 @@
 typedef void (*pltsql_sequence_validate_increment_hook_type) (int64 increment_by,
 																int64 max_value,
 																int64 min_value);
-extern PGDLLEXPORT pltsql_sequence_validate_increment_hook_type pltsql_sequence_validate_increment_hook;
+extern PGDLLIMPORT pltsql_sequence_validate_increment_hook_type pltsql_sequence_validate_increment_hook;
 
 /* Sequence datatype hook */
 typedef void (*pltsql_sequence_datatype_hook_type) (ParseState *pstate,
@@ -35,15 +35,15 @@ typedef void (*pltsql_sequence_datatype_hook_type) (ParseState *pstate,
 														DefElem *as_type,
 														DefElem **max_value,
 														DefElem **min_value);
-extern PGDLLEXPORT pltsql_sequence_datatype_hook_type pltsql_sequence_datatype_hook;
+extern PGDLLIMPORT pltsql_sequence_datatype_hook_type pltsql_sequence_datatype_hook;
 
 /* Sequence nextval hook */
 typedef void (*pltsql_nextval_hook_type) (Oid seqid, int64 val);
-extern PGDLLEXPORT pltsql_nextval_hook_type pltsql_nextval_hook;
+extern PGDLLIMPORT pltsql_nextval_hook_type pltsql_nextval_hook;
 
 /* Sequence reset cache hook */
 typedef void (*pltsql_resetcache_hook_type) ();
-extern PGDLLEXPORT pltsql_resetcache_hook_type pltsql_resetcache_hook;
+extern PGDLLIMPORT pltsql_resetcache_hook_type pltsql_resetcache_hook;
 
 /* Sequence setval hook */
 typedef int64 (*pltsql_setval_hook_type) (Oid seqid, int64 val, int64 last_val);

src/include/commands/tablecmds.h

@@ -106,17 +106,17 @@ extern bool PartConstraintImpliedByRelConstraint(Relation scanrel,
 												 List *partConstraint);
 
 typedef void (*InvokePreDropColumnHook_type) (Relation rel, AttrNumber attnum);
-extern PGDLLEXPORT InvokePreDropColumnHook_type InvokePreDropColumnHook;
+extern PGDLLIMPORT InvokePreDropColumnHook_type InvokePreDropColumnHook;
 
 typedef void (*InvokePreAddConstraintsHook_type) (Relation rel, ParseState *pstate,
 												  List *newColDefaults);
-extern PGDLLEXPORT InvokePreAddConstraintsHook_type InvokePreAddConstraintsHook;
+extern PGDLLIMPORT InvokePreAddConstraintsHook_type InvokePreAddConstraintsHook;
 typedef bool (*check_extended_attoptions_hook_type) (Node *options);
-extern PGDLLEXPORT check_extended_attoptions_hook_type check_extended_attoptions_hook;
+extern check_extended_attoptions_hook_type check_extended_attoptions_hook;
 
 typedef int (*find_attr_by_name_from_column_def_list_hook_type) (
 	const char *attributeName, List *schema);
-extern PGDLLEXPORT find_attr_by_name_from_column_def_list_hook_type
+extern PGDLLIMPORT find_attr_by_name_from_column_def_list_hook_type
 	find_attr_by_name_from_column_def_list_hook;
 
 #endif							/* TABLECMDS_H */

src/include/commands/trigger.h

@@ -312,12 +312,12 @@ extern void RI_PartitionRemove_Check(Trigger *trigger, Relation fk_rel,
 
 extern int	RI_FKey_trigger_type(Oid tgfoid);
 
-extern PGDLLEXPORT void BeginCompositeTriggers(MemoryContext curCxt);
-extern PGDLLEXPORT void EndCompositeTriggers(bool error);
+extern void BeginCompositeTriggers(MemoryContext curCxt);
+extern void EndCompositeTriggers(bool error);
 
 extern bool TsqlRecuresiveCheck(ResultRelInfo *resultRelInfo);
 
 typedef bool (*check_pltsql_support_tsql_transactions_hook_type) (void);
-extern PGDLLEXPORT check_pltsql_support_tsql_transactions_hook_type check_pltsql_support_tsql_transactions_hook;
+extern PGDLLIMPORT check_pltsql_support_tsql_transactions_hook_type check_pltsql_support_tsql_transactions_hook;
 
 #endif							/* TRIGGER_H */

src/include/commands/typecmds.h

@@ -61,6 +61,6 @@ extern ObjectAddress AlterType(AlterTypeStmt *stmt);
 extern bool enable_domain_typmod;
 
 typedef Oid (*define_type_default_collation_hook_type)(Oid);
-extern PGDLLEXPORT define_type_default_collation_hook_type define_type_default_collation_hook;
+extern PGDLLIMPORT define_type_default_collation_hook_type define_type_default_collation_hook;
 
 #endif							/* TYPECMDS_H */

src/include/commands/view.h

@@ -23,8 +23,8 @@ extern ObjectAddress DefineView(ViewStmt *stmt, const char *queryString,
 extern void StoreViewQuery(Oid viewOid, Query *viewParse, bool replace);
 
 typedef void (*store_view_definition_hook_type) (const char *queryString, ObjectAddress address);
-extern PGDLLEXPORT store_view_definition_hook_type	store_view_definition_hook;
+extern PGDLLIMPORT store_view_definition_hook_type	store_view_definition_hook;
 
 typedef void (*inherit_view_constraints_from_table_hook_type) (ColumnDef  *col, Oid tableOid, AttrNumber colId);
-extern PGDLLEXPORT inherit_view_constraints_from_table_hook_type inherit_view_constraints_from_table_hook;
+extern PGDLLIMPORT inherit_view_constraints_from_table_hook_type inherit_view_constraints_from_table_hook;
 #endif							/* VIEW_H */

src/include/executor/executor.h

@@ -73,22 +73,22 @@
 
 /* Hook for plugins to get control in ExecutorStart() */
 typedef void (*ExecutorStart_hook_type) (QueryDesc *queryDesc, int eflags);
-extern PGDLLEXPORT ExecutorStart_hook_type ExecutorStart_hook;
+extern PGDLLIMPORT ExecutorStart_hook_type ExecutorStart_hook;
 
 /* Hook for plugins to get control in ExecutorRun() */
 typedef void (*ExecutorRun_hook_type) (QueryDesc *queryDesc,
 									   ScanDirection direction,
 									   uint64 count,
 									   bool execute_once);
-extern PGDLLEXPORT ExecutorRun_hook_type ExecutorRun_hook;
+extern PGDLLIMPORT ExecutorRun_hook_type ExecutorRun_hook;
 
 /* Hook for plugins to get control in ExecutorFinish() */
 typedef void (*ExecutorFinish_hook_type) (QueryDesc *queryDesc);
-extern PGDLLEXPORT ExecutorFinish_hook_type ExecutorFinish_hook;
+extern PGDLLIMPORT ExecutorFinish_hook_type ExecutorFinish_hook;
 
 /* Hook for plugins to get control in ExecutorEnd() */
 typedef void (*ExecutorEnd_hook_type) (QueryDesc *queryDesc);
-extern PGDLLEXPORT ExecutorEnd_hook_type ExecutorEnd_hook;
+extern PGDLLIMPORT ExecutorEnd_hook_type ExecutorEnd_hook;
 
 /* Hook for plugins to get control in ExecCheckPermissions() */
 typedef bool (*ExecutorCheckPerms_hook_type) (List *rangeTable,
@@ -97,13 +97,13 @@ typedef bool (*ExecutorCheckPerms_hook_type) (List *rangeTable,
 extern PGDLLIMPORT ExecutorCheckPerms_hook_type ExecutorCheckPerms_hook;
 
 typedef bool (*TriggerRecuresiveCheck_hook_type) (ResultRelInfo *resultRelInfo);
-extern PGDLLEXPORT TriggerRecuresiveCheck_hook_type TriggerRecuresiveCheck_hook;
+extern PGDLLIMPORT TriggerRecuresiveCheck_hook_type TriggerRecuresiveCheck_hook;
 
 typedef bool (*bbfViewHasInsteadofTrigger_hook_type) (Relation view, CmdType event);
 extern PGDLLIMPORT bbfViewHasInsteadofTrigger_hook_type bbfViewHasInsteadofTrigger_hook;
 
 typedef bool (*check_rowcount_hook_type) (int es_processed);
-extern PGDLLEXPORT check_rowcount_hook_type check_rowcount_hook;
+extern PGDLLIMPORT check_rowcount_hook_type check_rowcount_hook;
 
 /*
  * prototypes from functions in execAmi.c

src/include/executor/spi.h

@@ -194,7 +194,7 @@ extern void SPI_cursor_fetch(Portal portal, bool forward, long count);
 extern void SPI_cursor_move(Portal portal, bool forward, long count);
 extern void SPI_scroll_cursor_fetch(Portal, FetchDirection direction, long count);
 extern void SPI_scroll_cursor_move(Portal, FetchDirection direction, long count);
-extern PGDLLEXPORT void SPI_scroll_cursor_fetch_dest(Portal portal, FetchDirection direction,
+extern void SPI_scroll_cursor_fetch_dest(Portal portal, FetchDirection direction,
 										 long count, DestReceiver *receiver);
 extern void SPI_cursor_close(Portal portal);
 
@@ -212,5 +212,5 @@ extern void AtEOXact_SPI(bool isCommit);
 extern void AtEOSubXact_SPI(bool isCommit, SubTransactionId mySubid);
 extern bool SPI_inside_nonatomic_context(void);
 
-extern PGDLLEXPORT void SPI_setCurrentInternalTxnMode(bool mode);
+extern void SPI_setCurrentInternalTxnMode(bool mode);
 #endif							/* SPI_H */

src/include/fmgr.h

@@ -802,8 +802,8 @@ extern set_local_schema_for_func_hook_type set_local_schema_for_func_hook;
 
 extern PGDLLIMPORT needs_fmgr_hook_type needs_fmgr_hook;
 extern PGDLLIMPORT fmgr_hook_type fmgr_hook;
-extern PGDLLEXPORT non_tsql_proc_entry_hook_type non_tsql_proc_entry_hook;
-extern PGDLLEXPORT get_func_language_oids_hook_type get_func_language_oids_hook;
+extern PGDLLIMPORT non_tsql_proc_entry_hook_type non_tsql_proc_entry_hook;
+extern PGDLLIMPORT get_func_language_oids_hook_type get_func_language_oids_hook;
 
 #define FmgrHookIsNeeded(fn_oid)							\
 	(!needs_fmgr_hook ? false : (*needs_fmgr_hook)(fn_oid))

src/include/funcapi.h

@@ -359,7 +359,7 @@ extern int	extract_variadic_args(FunctionCallInfo fcinfo, int variadic_start,
 
 typedef void (*modify_RangeTblFunction_tupdesc_hook_type) (
 	char *funcname, Node *expr, TupleDesc *tupdesc);
-extern PGDLLEXPORT modify_RangeTblFunction_tupdesc_hook_type
+extern PGDLLIMPORT modify_RangeTblFunction_tupdesc_hook_type
 	modify_RangeTblFunction_tupdesc_hook;
 
 #endif							/* FUNCAPI_H */

src/include/miscadmin.h

@@ -489,15 +489,15 @@ extern void TouchSocketLockFiles(void);
 extern void AddToDataDirLockFile(int target_line, const char *str);
 extern bool RecheckDataDirLockFile(void);
 extern void ValidatePgVersion(const char *path);
-extern PGDLLEXPORT void load_libraries(const char *libraries, const char *gucname, bool restricted);
+extern void load_libraries(const char *libraries, const char *gucname, bool restricted);
 extern void process_shared_preload_libraries(void);
 extern void process_session_preload_libraries(void);
 extern void process_shmem_requests(void);
 extern void pg_bindtextdomain(const char *domain);
 extern bool has_rolreplication(Oid roleid);
 
 typedef void (*shmem_request_hook_type) (void);
-extern PGDLLEXPORT shmem_request_hook_type shmem_request_hook;
+extern PGDLLIMPORT shmem_request_hook_type shmem_request_hook;
 
 extern Size EstimateClientConnectionInfoSpace(void);
 extern void SerializeClientConnectionInfo(Size maxsize, char *start_address);

src/include/nodes/nodeFuncs.h

@@ -220,6 +220,6 @@ extern bool planstate_tree_walker_impl(struct PlanState *planstate,
 									   void *context);
 
 typedef int32 (*coalesce_typmod_hook_type) (const CoalesceExpr *cexpr);
-extern PGDLLEXPORT coalesce_typmod_hook_type coalesce_typmod_hook;
+extern PGDLLIMPORT coalesce_typmod_hook_type coalesce_typmod_hook;
 
 #endif							/* NODEFUNCS_H */