[MASSMAIL] pgsql: Fix warnings re typedef redefinition in ea7b4e9a2a and 3311ea86e

Fix warnings re typedef redefinition in ea7b4e9a2a and 3311ea86ed

Per gripe from Tom Lane and the buildfarm

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/1b00fe30a67774e55c5fc776096a3c96f1a147d2

Modified Files
--------------
src/common/jsonapi.c        | 12 ++++++++----
src/common/parse_manifest.c |  5 +++--
2 files changed, 11 insertions(+), 6 deletions(-)