Static checks with GCC 4.6.0 and non-default toolkits.

3 files changed, 5 insertions, 6 deletions

diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
index 4c6fd3e2f9b..3d9bd6ddafc 100644
--- a/src/s/sol2-6.h
+++ b/src/s/sol2-6.h
@@ -44,7 +44,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define PTY_TTY_NAME_SPRINTF                    \
   {                                             \
-    char *ptsname (), *ptyname;                 \
+    char *ptsname (int), *ptyname;              \
                                                 \
     sigblock (sigmask (SIGCLD));                \
     if (grantpt (fd) == -1)                     \
@@ -60,4 +60,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
diff --git a/src/s/unixware.h b/src/s/unixware.h
index 407282ff78c..8fe28625dd4 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -35,7 +35,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    within, it should be caught after sigrelse(2).  */
 #define PTY_TTY_NAME_SPRINTF                    \
   {                                             \
-    char *ptsname(), *ptyname;                  \
+    char *ptsname (int), *ptyname;              \
                                                 \
     sigblock(sigmask(SIGCLD));                  \
     if (grantpt(fd) == -1)                      \
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 236f71e3007..e6d992d8f9c 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -88,11 +88,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Push various streams modules onto a PTY channel.  */
 #define SETUP_SLAVE_PTY \
   if (ioctl (xforkin, I_PUSH, "ptem") == -1)    \
-    fatal ("ioctl I_PUSH ptem", errno);         \
+    fatal ("ioctl I_PUSH ptem");                \
   if (ioctl (xforkin, I_PUSH, "ldterm") == -1)  \
-    fatal ("ioctl I_PUSH ldterm", errno);       \
+    fatal ("ioctl I_PUSH ldterm");      \
   if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \
-    fatal ("ioctl I_PUSH ttcompat", errno);
+    fatal ("ioctl I_PUSH ttcompat");
 
 /* This definition was suggested for next release.  So give it a try.  */
 #define HAVE_SOCKETS