fixes_9.91-95.patch

diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h
index cef9c4b456..1f0a93b1d6 100644
--- a/contrib/pgcrypto/px.h
+++ b/contrib/pgcrypto/px.h
@@ -50,9 +50,6 @@ void	   *px_realloc(void *p, size_t s);
 void		px_free(void *p);
 #endif
 
-/* max len of 'type' parms */
-#define PX_MAX_NAMELEN		128
-
 /* max salt returned */
 #define PX_MAX_SALT_LEN		128
 
@@ -210,8 +207,6 @@ void		px_debug(const char *fmt,...) pg_attribute_printf(1, 2);
 #define px_md_free(md)			(md)->free(md)
 
 #define px_hmac_result_size(hmac)	(hmac)->result_size(hmac)
-#define px_hmac_block_size(hmac)	(hmac)->block_size(hmac)
-#define px_hmac_reset(hmac)		(hmac)->reset(hmac)
 #define px_hmac_init(hmac, key, klen)	(hmac)->init(hmac, key, klen)
 #define px_hmac_update(hmac, data, dlen) (hmac)->update(hmac, data, dlen)
 #define px_hmac_finish(hmac, buf)	(hmac)->finish(hmac, buf)
diff --git a/contrib/pgcrypto/sha1.c b/contrib/pgcrypto/sha1.c
index fb6a57d917..64671ac64d 100644
--- a/contrib/pgcrypto/sha1.c
+++ b/contrib/pgcrypto/sha1.c
@@ -59,16 +59,6 @@ static uint32 _K[] = {0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6};
 #define BCOUNT	(ctxt->c.b64[0] / 8)
 #define W(n)	(ctxt->m.b32[(n)])
 
-#define PUTBYTE(x) \
-do { \
-	ctxt->m.b8[(COUNT % 64)] = (x);		\
-	COUNT++;				\
-	COUNT %= 64;				\
-	ctxt->c.b64[0] += 8;			\
-	if (COUNT % 64 == 0)			\
-		sha1_step(ctxt);		\
-} while (0)
-
 #define PUTPAD(x) \
 do { \
 	ctxt->m.b8[(COUNT % 64)] = (x);		\
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index fadab62950..469aac38c4 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -265,7 +265,6 @@ CreateSharedProcArray(void)
 							&found);
 	}
 
-	/* Register and initialize fields of ProcLWLockTranche */
 	LWLockRegisterTranche(LWTRANCHE_PROC, "proc");
 }
 
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index ac7ee72952..281e1db725 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -332,4 +332,4 @@ extern PGPROC *AuxiliaryPidGetProc(int pid);
 extern void BecomeLockGroupLeader(void);
 extern bool BecomeLockGroupMember(PGPROC *leader, int pid);
 
-#endif							/* PROC_H */
+#endif							/* _PROC_H_ */