From 3a2421c94015432caa49e166bc5bf5c4f80ab7c7 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 3 Aug 2016 15:27:03 +0200
Subject: [PATCH] common: New file utilproto.c

* common/util.h: Factor prototypes from signal.c out to ...
* common/utilproto.h: new.
* common/Makefile.am (common_sources): Add new file.

Signed-off-by: Werner Koch <wk@gnupg.org>
---
 common/Makefile.am |  2 +-
 common/fwddecl.h   |  2 +-
 common/util.h      |  6 +-----
 common/utilproto.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 common/utilproto.h

diff --git a/common/Makefile.am b/common/Makefile.am
index 759800bab..2a24c57cc 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -42,7 +42,7 @@ include $(top_srcdir)/am/cmacros.am
 
 common_sources = \
 	common-defs.h \
-	util.h fwddecl.h i18n.c i18n.h \
+	util.h utilproto.h fwddecl.h i18n.c i18n.h \
 	types.h host2net.h dynload.h w32help.h \
 	mapstrings.c stringhelp.c stringhelp.h \
 	strlist.c strlist.h \
diff --git a/common/fwddecl.h b/common/fwddecl.h
index 92f045389..f9d7536f1 100644
--- a/common/fwddecl.h
+++ b/common/fwddecl.h
@@ -1,4 +1,4 @@
-/* fwddecl.h - Formward declarations
+/* fwddecl.h - Forward declarations
  * Copyright (C) 2015 Werner Koch
  *
  * This file is part of GnuPG.
diff --git a/common/util.h b/common/util.h
index eb7a3fd31..29e0ec98e 100644
--- a/common/util.h
+++ b/common/util.h
@@ -54,6 +54,7 @@
 #include "../common/utf8conv.h"
 #include "../common/dynload.h"
 #include "../common/fwddecl.h"
+#include "../common/utilproto.h"
 
 #include "gettime.h"
 
@@ -114,11 +115,6 @@ out_of_core (void)
 }
 
 
-/*-- signal.c --*/
-void gnupg_init_signals (int mode, void (*fast_cleanup)(void));
-void gnupg_block_all_signals (void);
-void gnupg_unblock_all_signals (void);
-
 /*-- yesno.c --*/
 int answer_is_yes (const char *s);
 int answer_is_yes_no_default (const char *s, int def_answer);
diff --git a/common/utilproto.h b/common/utilproto.h
new file mode 100644
index 000000000..5bb9dd113
--- /dev/null
+++ b/common/utilproto.h
@@ -0,0 +1,44 @@
+/* utilproto.h - Some prototypes for inclusion by util.h
+ * Copyright (C) 2016 Werner Koch
+ *
+ * This file is part of GnuPG.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
+ *
+ *   - the GNU Lesser General Public License as published by the Free
+ *     Software Foundation; either version 3 of the License, or (at
+ *     your option) any later version.
+ *
+ * or
+ *
+ *   - the GNU General Public License as published by the Free
+ *     Software Foundation; either version 2 of the License, or (at
+ *     your option) any later version.
+ *
+ * or both in parallel, as here.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* This file is in general included via util.h but sometimes we do not
+ * want all stuff from util.h and instead use this file with its
+ * simple prototypes.  */
+
+#ifndef GNUPG_COMMON_UTILPROTO_H
+#define GNUPG_COMMON_UTILPROTO_H
+
+/*-- signal.c --*/
+void gnupg_init_signals (int mode, void (*fast_cleanup)(void));
+void gnupg_block_all_signals (void);
+void gnupg_unblock_all_signals (void);
+
+
+
+#endif /*GNUPG_COMMON_UTILPROTO_H*/