From: Pavan Deolasee <pavan.deolasee@gmail.com>
Date: Thu, 28 Jan 2016 12:50:32 +0000 (+0530)
Subject: Avoid redefinition of a signal handler signature
X-Git-Tag: XL9_5_R1BETA1~51
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=4d00928f9068e775462c77a6211a295bbaa64f6e;p=postgres-xl.git

Avoid redefinition of a signal handler signature
---

diff --git a/contrib/pgxc_ctl/do_shell.h b/contrib/pgxc_ctl/do_shell.h
index 88d72d3060..6d580a4d44 100644
--- a/contrib/pgxc_ctl/do_shell.h
+++ b/contrib/pgxc_ctl/do_shell.h
@@ -18,7 +18,10 @@ extern jmp_buf dcJmpBufMainLoop;
 
 extern void dcSigHandler(int signum);
 typedef enum FileType { STDIN, STDOUT, STDERR, GENERAL } FileType;
-typedef void (*pqsigfunc) (int);
+#ifndef PGSIGFUNC
+#define PGSIGFUNC
+typedef void (*pqsigfunc) (int signo);
+#endif
 extern char *createLocalFileName(FileType type, char *buf, int len);
 extern char *createRemoteFileName(FileType type, char *buf, int len);
 extern int doImmediate(char *host, char *stdIn, const char *cmd_fmt, ...) __attribute__((format(printf, 3, 4)));
diff --git a/src/include/port.h b/src/include/port.h
index 3787cbfb76..634f4d45bf 100644
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -458,8 +458,12 @@ extern int	pg_check_dir(const char *dir);
 /* port/pgmkdirp.c */
 extern int	pg_mkdir_p(char *path, int omode);
 
+#ifndef PGSIGFUNC
+#define PGSIGFUNC
 /* port/pqsignal.c */
 typedef void (*pqsigfunc) (int signo);
+#endif
+
 extern pqsigfunc pqsignal(int signo, pqsigfunc func);
 
 /* port/quotes.c */