X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnfsc%2Flibnfs-zdr.h;h=55daa1221a7f4430996526afe464781ba55a6f8f;hb=d7c6e9aaa9df593e951e2f19106dcc71102e74f1;hp=44f73786c91d97330884ee67fb01f947183eb1ef;hpb=5ba63317aca8054280b18453790d23a448bdf92c;p=deb_libnfs.git

diff --git a/include/nfsc/libnfs-zdr.h b/include/nfsc/libnfs-zdr.h
index 44f7378..55daa12 100644
--- a/include/nfsc/libnfs-zdr.h
+++ b/include/nfsc/libnfs-zdr.h
@@ -26,7 +26,9 @@
  * and slightly modified.
  ************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #ifndef _LIBNFS_ZDR_H_
 #define _LIBNFS_ZDR_H_
@@ -58,8 +60,12 @@ typedef void SVCXPRT;
 #define IZDR_PUT_BOOL(...)		assert(0)
 #define IZDR_GET_BOOL(...)		(assert(0), 0)
 
+#ifndef TRUE
 #define TRUE		1
+#endif
+#ifndef FALSE
 #define FALSE		0
+#endif
 
 enum zdr_op {
 	ZDR_ENCODE = 0,
@@ -178,8 +184,8 @@ struct rejected_reply {
 	enum reject_stat stat;
 	union {
 		struct {
-			u_long low;
-			u_long high;
+			uint32_t low;
+			uint32_t high;
 		} mismatch_info;
 		enum auth_stat stat;
 	} reject_data;