From: Marcus Brinkmann <mb@g10code.com>
Date: Sat, 11 Dec 2004 15:50:12 +0000 (+0000)
Subject: 2004-12-11  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-1.2.0@1385~353
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=12c12dd97a3556889e22152d7b5ae2844e53ee0f;p=gpgme.git

2004-12-11  Marcus Brinkmann  <marcus@g10code.de>

	* configure.ac: Replace ttyname_r if it doesn't exist (and warn in
	that case).

gpgme/
2004-12-11  Marcus Brinkmann  <marcus@g10code.de>

	* util.h [HAVE_CONFIG_H && HAVE_TTYNAME_R] (ttyname_r): Define
	prototype.
	* ttyname_r.c: New file.
---

diff --git a/branches/gpgme-1-0-branch/ChangeLog b/branches/gpgme-1-0-branch/ChangeLog
index 3b14f76..2e70aa4 100644
--- a/branches/gpgme-1-0-branch/ChangeLog
+++ b/branches/gpgme-1-0-branch/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-11  Marcus Brinkmann  <marcus@g10code.de>
+
+	* configure.ac: Replace ttyname_r if it doesn't exist (and warn in
+	that case).
+
 2004-12-07  Marcus Brinkmann  <marcus@g10code.de>
 
 	* README: Refer to COPYING.LESSER and "each file" instead of
diff --git a/branches/gpgme-1-0-branch/configure.ac b/branches/gpgme-1-0-branch/configure.ac
index 3fed5e5..a1e9bf7 100644
--- a/branches/gpgme-1-0-branch/configure.ac
+++ b/branches/gpgme-1-0-branch/configure.ac
@@ -171,6 +171,15 @@ if test "$ac_cv_func_vasprintf" != yes; then
   GNUPG_CHECK_VA_COPY
 fi
 
+# Try to find a thread-safe version of ttyname().
+AC_REPLACE_FUNCS(ttyname_r)
+if test "$ac_cv_func_ttyname_r" != yes; then
+  AC_MSG_WARN([
+***
+*** ttyname() is not thread-safe and ttyname_r() does not exist
+***])
+fi
+
 # Try to find a thread-safe version of getenv().
 have_thread_safe_getenv=no
 jm_GLIBC21
diff --git a/branches/gpgme-1-0-branch/gpgme/ChangeLog b/branches/gpgme-1-0-branch/gpgme/ChangeLog
index be8782f..a5aa3a3 100644
--- a/branches/gpgme-1-0-branch/gpgme/ChangeLog
+++ b/branches/gpgme-1-0-branch/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-11  Marcus Brinkmann  <marcus@g10code.de>
+
+	* util.h [HAVE_CONFIG_H && HAVE_TTYNAME_R] (ttyname_r): Define
+	prototype.
+	* ttyname_r.c: New file.
+
 2004-12-07  Marcus Brinkmann  <marcus@g10code.de>
 
 	* putc_unlocked.c, funopen.c: I just claim copyright on these
diff --git a/branches/gpgme-1-0-branch/gpgme/util.h b/branches/gpgme-1-0-branch/gpgme/util.h
index 0a6f684..0434208 100644
--- a/branches/gpgme-1-0-branch/gpgme/util.h
+++ b/branches/gpgme-1-0-branch/gpgme/util.h
@@ -44,6 +44,10 @@ char *stpcpy (char *a, const char *b);
 int vasprintf (char **result, const char *format, va_list args);
 int asprintf (char **result, const char *format, ...);
 #endif
+
+#ifndef HAVE_TTYNAME_R
+int ttyname_r (int fd, char *buf, size_t buflen);
+#endif
 #endif