Commit1b00fe3

committed

Fix warnings re typedef redefinition inea7b4e9 and3311ea8

Per gripe from Tom Lane and the buildfarm

1 parent6f4d63e commit1b00fe3Copy full SHA for 1b00fe3

File tree

+11

-6

lines changed

+11

-6

lines changed

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,10 @@ typedef enum`
`78`	`78`	`* struct containing the 3 stacks used in non-recursive parsing,`
`79`	`79`	`* and the token and value for scalars that need to be preserved`
`80`	`80`	`* across calls.`
	`81`	`+ *`
	`82`	`+ * typedef appears in jsonapi.h`
`81`	`83`	`*/`
`82`		`-typedefstructJsonParserStack`
	`84`	`+structJsonParserStack`
`83`	`85`	`{`
`84`	`86`	`intstack_size;`
`85`	`87`	`char*prediction;`
`@@ -89,18 +91,20 @@ typedef struct JsonParserStack`
`89`	`91`	`bool*fnull;`
`90`	`92`	`JsonTokenTypescalar_tok;`
`91`	`93`	`char*scalar_val;`
`92`		`-}JsonParserStack;`
	`94`	`+};`
`93`	`95`
`94`	`96`	`/*`
`95`	`97`	`* struct containing state used when there is a possible partial token at the`
`96`	`98`	`* end of a json chunk when we are doing incremental parsing.`
	`99`	`+ *`
	`100`	`+ * typedef appears in jsonapi.h`
`97`	`101`	`*/`
`98`		`-typedefstructJsonIncrementalState`
	`102`	`+structJsonIncrementalState`
`99`	`103`	`{`
`100`	`104`	`boolis_last_chunk;`
`101`	`105`	`boolpartial_completed;`
`102`	`106`	`StringInfoDatapartial_token;`
`103`		`-}JsonIncrementalState;`
	`107`	`+};`
`104`	`108`
`105`	`109`	`/*`
`106`	`110`	`* constants and macros used in the nonrecursive parser`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,13 @@ typedef struct`
`91`	`91`	`char*manifest_checksum;`
`92`	`92`	`}JsonManifestParseState;`
`93`	`93`
`94`		`-typedefstructJsonManifestParseIncrementalState`
	`94`	`+/* typedef appears in parse_manifest.h */`
	`95`	`+structJsonManifestParseIncrementalState`
`95`	`96`	`{`
`96`	`97`	`JsonLexContextlex;`
`97`	`98`	`JsonSemActionsem;`
`98`	`99`	`pg_cryptohash_ctx*manifest_ctx;`
`99`		`-}JsonManifestParseIncrementalState;`
	`100`	`+};`
`100`	`101`
`101`	`102`	`staticJsonParseErrorTypejson_manifest_object_start(void*state);`
`102`	`103`	`staticJsonParseErrorTypejson_manifest_object_end(void*state);`

Comments

(0)