aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2004-12-11 15:50:12 +0000
committerMarcus Brinkmann <[email protected]>2004-12-11 15:50:12 +0000
commit12c12dd97a3556889e22152d7b5ae2844e53ee0f (patch)
tree747eba0c8748f187924e3da4fafaa394cd870898
parentThis commit was manufactured by cvs2svn to create branch (diff)
downloadgpgme-12c12dd97a3556889e22152d7b5ae2844e53ee0f.tar.gz
gpgme-12c12dd97a3556889e22152d7b5ae2844e53ee0f.zip
2004-12-11 Marcus Brinkmann <[email protected]>
* configure.ac: Replace ttyname_r if it doesn't exist (and warn in that case). gpgme/ 2004-12-11 Marcus Brinkmann <[email protected]> * util.h [HAVE_CONFIG_H && HAVE_TTYNAME_R] (ttyname_r): Define prototype. * ttyname_r.c: New file.
-rw-r--r--branches/gpgme-1-0-branch/ChangeLog5
-rw-r--r--branches/gpgme-1-0-branch/configure.ac9
-rw-r--r--branches/gpgme-1-0-branch/gpgme/ChangeLog6
-rw-r--r--branches/gpgme-1-0-branch/gpgme/util.h4
4 files changed, 24 insertions, 0 deletions
diff --git a/branches/gpgme-1-0-branch/ChangeLog b/branches/gpgme-1-0-branch/ChangeLog
index 3b14f76c..2e70aa46 100644
--- a/branches/gpgme-1-0-branch/ChangeLog
+++ b/branches/gpgme-1-0-branch/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-11 Marcus Brinkmann <[email protected]>
+
+ * configure.ac: Replace ttyname_r if it doesn't exist (and warn in
+ that case).
+
2004-12-07 Marcus Brinkmann <[email protected]>
* 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 3fed5e50..a1e9bf76 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 be8782f6..a5aa3a35 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 <[email protected]>
+
+ * util.h [HAVE_CONFIG_H && HAVE_TTYNAME_R] (ttyname_r): Define
+ prototype.
+ * ttyname_r.c: New file.
+
2004-12-07 Marcus Brinkmann <[email protected]>
* 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 0a6f684a..0434208d 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