Merge tag 'upstream/1.0' into debian

Upstream version 1.0

1 files changed, 12 insertions, 2 deletions

diff --git a/portable/mkstemp.c b/portable/mkstemp.c
index dd2a485..8668db1 100644
--- a/portable/mkstemp.c
+++ b/portable/mkstemp.c
@@ -4,8 +4,18 @@
  * Provides the same functionality as the library function mkstemp for those
  * systems that don't have it.
  *
+ * The canonical version of this file is maintained in the rra-c-util package,
+ * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
+ *
  * Written by Russ Allbery <rra@stanford.edu>
- * This work is hereby placed in the public domain by its author.
+ *
+ * The authors hereby relinquish any claim to any copyright that they may have
+ * in this work, whether granted under contract or by operation of law or
+ * international treaty, and hereby commit to the public, at large, that they
+ * shall not, at any time in the future, seek to enforce any copyright in this
+ * work against any person or entity, or prevent any person or entity from
+ * copying, publishing, distributing or creating derivative works of this
+ * work.
  */
 
 #include <config.h>
@@ -27,7 +37,7 @@ int test_mkstemp(char *);
 #endif
 
 /* Pick the longest available integer type. */
-#if HAVE_LONG_LONG
+#if HAVE_LONG_LONG_INT
 typedef unsigned long long long_int_type;
 #else
 typedef unsigned long long_int_type;