diff options
| author | Pavan Deolasee | 2017-06-27 11:23:19 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2017-06-27 11:23:19 +0000 |
| commit | e3e1c61e5ee9facf3b0a9bd6a0ce79da7011f9f2 (patch) | |
| tree | cad4a0509c9ac54e260ba922b90b086804bad2d4 /src/include/postgres.h | |
| parent | 668079ca5792a23fc0e220750bff51bb0558b4a5 (diff) | |
| parent | 2710ccd782d0308a3fa1ab193531183148e9b626 (diff) | |
Merge PG10 master branch into xl10devel
This commit merges PG10 branch upto commit
2710ccd782d0308a3fa1ab193531183148e9b626. Regression tests show no noteworthy
additional failures. This merge includes major pgindent work done with the
newer version of pgindent
Diffstat (limited to 'src/include/postgres.h')
| -rw-r--r-- | src/include/postgres.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/include/postgres.h b/src/include/postgres.h index 7426a253d2..29eec53bf8 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -81,7 +81,7 @@ typedef struct varatt_external int32 va_extsize; /* External saved size (doesn't) */ Oid va_valueid; /* Unique ID of value within TOAST table */ Oid va_toastrelid; /* RelID of TOAST table containing it */ -} varatt_external; +} varatt_external; /* * struct varatt_indirect is a "TOAST pointer" representing an out-of-line @@ -95,7 +95,7 @@ typedef struct varatt_external typedef struct varatt_indirect { struct varlena *pointer; /* Pointer to in-memory varlena */ -} varatt_indirect; +} varatt_indirect; /* * struct varatt_expanded is a "TOAST pointer" representing an out-of-line @@ -157,7 +157,7 @@ typedef union { uint32 va_header; uint32 va_rawsize; /* Original data size (excludes header) */ - char va_data[FLEXIBLE_ARRAY_MEMBER]; /* Compressed data */ + char va_data[FLEXIBLE_ARRAY_MEMBER]; /* Compressed data */ } va_compressed; } varattrib_4b; @@ -274,7 +274,7 @@ typedef struct #define SET_VARTAG_1B_E(PTR,tag) \ (((varattrib_1b_e *) (PTR))->va_header = 0x01, \ ((varattrib_1b_e *) (PTR))->va_tag = (tag)) -#endif /* WORDS_BIGENDIAN */ +#endif /* WORDS_BIGENDIAN */ #define VARHDRSZ_SHORT offsetof(varattrib_1b, va_data) #define VARATT_SHORT_MAX 0x7F @@ -811,10 +811,7 @@ extern Datum Float8GetDatum(float8 X); */ extern void ExceptionalCondition(const char *conditionName, const char *errorType, - const char *fileName, int lineNumber) pg_attribute_noreturn(); - -//#define PGXC_COORD // for PGXC coordinator compiling -//#define PGXC_DATANODE // for PGXC data node compiling + const char *fileName, int lineNumber) pg_attribute_noreturn(); extern void ResetUsageCommon(struct rusage *save_r, struct timeval *save_t); @@ -822,4 +819,4 @@ extern void ResetUsage(void); extern void ShowUsageCommon(const char *title, struct rusage *save_r, struct timeval *save_t); -#endif /* POSTGRES_H */ +#endif /* POSTGRES_H */ |