[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    New glibc 2.2 patch for kdelibs
From:       Bernhard Rosenkraenzer <bero () redhat ! de>
Date:       2000-10-01 12:39:06
[Download RAW message or body]

This one addresses only the grantpty() stuff - the isatty() stuff can be
fixed with %never-interactive (as suggested before), or by fixing up flex
(I've fixed the generation of broken code in 2.5.4a-13 (rawhide)), and
wouldn't mind adding the flex update to the required KDE 2.0 packages.

LLaP
bero

["kdelibs-1.94-glibc22.patch" (TEXT/PLAIN)]

--- kdelibs/kdesu/kdesu_pty.cpp.glibc22	Mon Aug 21 22:31:28 2000
+++ kdelibs/kdesu/kdesu_pty.cpp	Sat Sep 30 19:19:49 2000
@@ -47,6 +47,8 @@
 #include "kdesu_pty.h"
 
 // stdlib.h is meant to declare the prototypes but doesn't :(
+// In glibc 2.2, it does, though - and they're different from this.
+#ifndef HAVE_GRANTPT_PROTOTYPE 
 #ifdef HAVE_GRANTPT
 extern "C" int grantpt(int fd);
 #endif
@@ -57,6 +59,7 @@
 
 #ifdef HAVE_UNLOCKPT
 extern "C" int unlockpt(int fd);
+#endif
 #endif
 
 #ifdef HAVE_PTY_H
--- kdelibs/configure.in.in.glibc22	Sat Sep 30 15:28:41 2000
+++ kdelibs/configure.in.in	Sat Sep 30 19:21:51 2000
@@ -253,3 +253,18 @@
 ], [kde_distribution_text='compiled sources'])
 AC_DEFINE_UNQUOTED(KDE_DISTRIBUTION_TEXT, "$kde_distribution_text", [Distribution Text to append to OS])
 AC_MSG_RESULT($kde_distribution_text)
+
+AC_MSG_CHECKING(if stdlib.h has prototypes for grantpt, ptsname and unlockpt)
+AC_TRY_COMPILE([
+#define _XOPEN_SOURCE 500
+void grantpt(int fd);
+void ptsname(int fd);
+void unlockpt(int fd);
+#include <stdlib.h>], [],
+ac_cv_have_grantpt_prototype=no,
+ac_cv_have_grantpt_prototype=yes)
+AC_MSG_RESULT($ac_cv_have_grantpt_prototype)
+if test "$ac_cv_have_grantpt_prototype" = "yes"; then
+  AC_DEFINE(HAVE_GRANTPT_PROTOTYPE, 1, [Define if stdlib.h has a prototype for grantpt])
+fi
+


[prev in list] [next in list] [prev in thread] [next in thread]