summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--bufaux.c4
-rw-r--r--bufaux.h2
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 @@
120030427 120030427
2 - (bal) Bug #541: return; was dropped by mistake. Reported by 2 - (bal) Bug #541: return; was dropped by mistake. Reported by
3 furrier@iglou.com 3 furrier@iglou.com
4 - (bal) Since we don't support platforms lacking u_int_64. We may
5 as well clean out some of those evil #ifdefs
4 6
520030409 720030409
6 - (djm) Bug #539: Specify creation mode with O_CREAT for lastlog. Report 8 - (djm) Bug #539: Specify creation mode with O_CREAT for lastlog. Report
@@ -1341,4 +1343,4 @@
1341 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1343 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1342 ok provos@ 1344 ok provos@
1343 1345
1344$Id: ChangeLog,v 1.2659 2003/04/27 17:55:33 mouring Exp $ 1346$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)
165 return GET_32BIT(buf); 165 return GET_32BIT(buf);
166} 166}
167 167
168#ifdef HAVE_U_INT64_T
169u_int64_t 168u_int64_t
170buffer_get_int64(Buffer *buffer) 169buffer_get_int64(Buffer *buffer)
171{ 170{
@@ -174,7 +173,6 @@ buffer_get_int64(Buffer *buffer)
174 buffer_get(buffer, (char *) buf, 8); 173 buffer_get(buffer, (char *) buf, 8);
175 return GET_64BIT(buf); 174 return GET_64BIT(buf);
176} 175}
177#endif
178 176
179/* 177/*
180 * Stores integers in the buffer, msb first. 178 * Stores integers in the buffer, msb first.
@@ -197,7 +195,6 @@ buffer_put_int(Buffer *buffer, u_int value)
197 buffer_append(buffer, buf, 4); 195 buffer_append(buffer, buf, 4);
198} 196}
199 197
200#ifdef HAVE_U_INT64_T
201void 198void
202buffer_put_int64(Buffer *buffer, u_int64_t value) 199buffer_put_int64(Buffer *buffer, u_int64_t value)
203{ 200{
@@ -206,7 +203,6 @@ buffer_put_int64(Buffer *buffer, u_int64_t value)
206 PUT_64BIT(buf, value); 203 PUT_64BIT(buf, value);
207 buffer_append(buffer, buf, 8); 204 buffer_append(buffer, buf, 8);
208} 205}
209#endif
210 206
211/* 207/*
212 * Returns an arbitrary binary string from the buffer. The string cannot 208 * 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);
29u_int buffer_get_int(Buffer *); 29u_int buffer_get_int(Buffer *);
30void buffer_put_int(Buffer *, u_int); 30void buffer_put_int(Buffer *, u_int);
31 31
32#ifdef HAVE_U_INT64_T
33u_int64_t buffer_get_int64(Buffer *); 32u_int64_t buffer_get_int64(Buffer *);
34void buffer_put_int64(Buffer *, u_int64_t); 33void buffer_put_int64(Buffer *, u_int64_t);
35#endif
36 34
37int buffer_get_char(Buffer *); 35int buffer_get_char(Buffer *);
38void buffer_put_char(Buffer *, int); 36void buffer_put_char(Buffer *, int);