fix compilation warnings in Simon's latest GSSAPI patch

[gssapi-openssh.git] / openssh / xmalloc.h

diff --git a/openssh/xmalloc.h b/openssh/xmalloc.h
index fb217a45c9032c8b3a25e99c56720b0515e2573b..e14d0141d1dad18b83f9c8ca0976fdc53a60bfa0 100644 (file)
--- a/openssh/xmalloc.h
+++ b/openssh/xmalloc.h
@@ -1,5 +1,3 @@
-/* $OpenBSD: xmalloc.h,v 1.13 2006/08/03 03:34:42 deraadt Exp $ */
-
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -16,11 +14,14 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
+/* RCSID("$OpenBSD: xmalloc.h,v 1.7 2001/06/26 17:27:25 markus Exp $"); */
+
+#ifndef XMALLOC_H
+#define XMALLOC_H
+
 void   *xmalloc(size_t);
-void   *xcalloc(size_t, size_t);
-void   *xrealloc(void *, size_t, size_t);
+void   *xrealloc(void *, size_t);
 void     xfree(void *);
-char   *xstrdup(const char *);
-int     xasprintf(char **, const char *, ...)
-                __attribute__((__format__ (printf, 2, 3)))
-                __attribute__((__nonnull__ (2)));
+char   *xstrdup(const char *);
+
+#endif                         /* XMALLOC_H */