Merge master

[netatalk.git] / libatalk / compat / rquota_xdr.c

diff --git a/libatalk/compat/rquota_xdr.c b/libatalk/compat/rquota_xdr.c
index cf311249c052e0af3cc4fbb56836032b0be571c4..5aa27a42b667718116c966319764e1d8b896ca77 100644 (file)
--- a/libatalk/compat/rquota_xdr.c
+++ b/libatalk/compat/rquota_xdr.c
@@ -1,4 +1,7 @@
-/* taken from the quota-1.55 used on linux. here's the bsd copyright:
+/*
+ * $Id: rquota_xdr.c,v 1.4 2003-02-17 01:51:08 srittau Exp $
+ *
+ * taken from the quota-1.55 used on linux. here's the bsd copyright:
  *
  * Copyright (c) 1980, 1990 Regents of the University of California. All
  * rights reserved.
@@ -9,18 +12,19 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #include <stdio.h> /* to get __GNU_LIBRARY__ */
 
-static int _xdr_rquota_dummy;
-
 /* list of machines that don't have these functions:
        solaris
        linux libc5
 */
-#if defined(NEED_RQUOTA) || (defined(sun) && defined(__svr4__)) || \
-(defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ < 6)
+#if defined(NEED_RQUOTA) || defined(SOLARIS) || (defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ < 6)
+
+#ifndef u_int
+#define u_int unsigned
+#endif
 
 #include <rpc/rpc.h>
 #include <rpcsvc/rquota.h>