- (bal) Since we don't support platforms lacking u_int_64. We may

   as well clean out some of those evil #ifdefs

3 files changed, 3 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 484a50d8d..47ce5045b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20030427
  - (bal) Bug #541: return; was dropped by mistake.  Reported by 
    furrier@iglou.com
+ - (bal) Since we don't support platforms lacking u_int_64.  We may
+   as well clean out some of those evil #ifdefs
 
 20030409
  - (djm) Bug #539: Specify creation mode with O_CREAT for lastlog. Report 
@@ -1341,4 +1343,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2659 2003/04/27 17:55:33 mouring Exp $
+$Id: ChangeLog,v 1.2660 2003/04/27 18:01:37 mouring Exp $
diff --git a/bufaux.c b/bufaux.c
index 8066f77b5..16cd2d01c 100644
--- a/bufaux.c
+++ b/bufaux.c
@@ -165,7 +165,6 @@ buffer_get_int(Buffer *buffer)
 	return GET_32BIT(buf);
 }
 
-#ifdef HAVE_U_INT64_T
 u_int64_t
 buffer_get_int64(Buffer *buffer)
 {
@@ -174,7 +173,6 @@ buffer_get_int64(Buffer *buffer)
 	buffer_get(buffer, (char *) buf, 8);
 	return GET_64BIT(buf);
 }
-#endif
 
 /*
  * Stores integers in the buffer, msb first.
@@ -197,7 +195,6 @@ buffer_put_int(Buffer *buffer, u_int value)
 	buffer_append(buffer, buf, 4);
 }
 
-#ifdef HAVE_U_INT64_T
 void
 buffer_put_int64(Buffer *buffer, u_int64_t value)
 {
@@ -206,7 +203,6 @@ buffer_put_int64(Buffer *buffer, u_int64_t value)
 	PUT_64BIT(buf, value);
 	buffer_append(buffer, buf, 8);
 }
-#endif
 
 /*
  * Returns an arbitrary binary string from the buffer.  The string cannot
diff --git a/bufaux.h b/bufaux.h
index 80f35c1ec..935553579 100644
--- a/bufaux.h
+++ b/bufaux.h
@@ -29,10 +29,8 @@ void	buffer_put_short(Buffer *, u_short);
 u_int	buffer_get_int(Buffer *);
 void    buffer_put_int(Buffer *, u_int);
 
-#ifdef HAVE_U_INT64_T
 u_int64_t buffer_get_int64(Buffer *);
 void	buffer_put_int64(Buffer *, u_int64_t);
-#endif
 
 int     buffer_get_char(Buffer *);
 void    buffer_put_char(Buffer *, int);