From: Michael. R. Crusoe <crusoe@debian.org>
Subject: t64 transition fixes
Forwarded: https://github.com/ketiltrout/getdata/pull/10
--- libgetdata.orig/src/flimits.c
+++ libgetdata/src/flimits.c
@@ -130,6 +130,7 @@
   return D->fragment[fragment].frame_offset;
 }
 
+#if !(defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64)
 /* 32(ish)-bit wrappers for the 64-bit versions, when needed */
 int gd_alter_frameoffset(DIRFILE* D, off_t offset, int fragment, int move)
 {
@@ -140,6 +141,7 @@
 {
   return gd_frameoffset64(D, fragment);
 }
+#endif
 
 off64_t _GD_GetEOF(DIRFILE *restrict D, gd_entry_t *restrict E,
     const char *restrict parent, int *restrict is_index)
@@ -340,11 +342,13 @@
   return ns;
 }
 
+#if !(defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64)
 /* 32(ish)-bit wrapper for the 64-bit version, when needed */
 off_t gd_eof(DIRFILE* D, const char *field_code)
 {
   return (off_t)gd_eof64(D, field_code);
 }
+#endif
 
 static off64_t _GD_GetBOF(DIRFILE *restrict D, gd_entry_t *restrict E,
     const char *restrict parent, unsigned int *restrict spf,
@@ -510,10 +514,12 @@
   return bof;
 }
 
+#if !(defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64)
 /* 32(ish)-bit wrapper for the 64-bit version, when needed */
 off_t gd_bof(DIRFILE* D, const char *field_code) gd_nothrow
 {
   return (off_t)gd_bof64(D, field_code);
 }
+#endif
 /* vim: ts=2 sw=2 et tw=80
 */
--- libgetdata.orig/src/getdata.c
+++ libgetdata/src/getdata.c
@@ -2051,6 +2051,7 @@
   return n_read;
 }
 
+#if !(defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64)
 /* 32(ish)-bit wrapper for the 64-bit version, when needed */
 size_t gd_getdata(DIRFILE* D, const char *field_code, off_t first_frame,
     off_t first_samp, size_t num_frames, size_t num_samp,
@@ -2059,5 +2060,6 @@
   return gd_getdata64(D, field_code, first_frame, first_samp, num_frames,
       num_samp, return_type, data_out);
 }
+#endif
 /* vim: ts=2 sw=2 et tw=80
 */
--- libgetdata.orig/src/nframes.c
+++ libgetdata/src/nframes.c
@@ -73,10 +73,12 @@
   return nf;
 }
 
+#if !(defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64)
 /* 32(ish)-bit wrapper for the 64-bit version, when needed */
 off_t gd_nframes(DIRFILE* D)
 {
   return (off_t)gd_nframes64(D);
 }
+#endif
 /* vim: ts=2 sw=2 et tw=80
 */
--- libgetdata.orig/src/putdata.c
+++ libgetdata/src/putdata.c
@@ -816,6 +816,7 @@
   return n_wrote;
 }
 
+#if !(defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64)
 /* 32(ish)-bit wrapper for the 64-bit version, when needed */
 size_t gd_putdata(DIRFILE* D, const char *field_code, off_t first_frame,
     off_t first_samp, size_t num_frames, size_t num_samp, gd_type_t data_type,
@@ -824,5 +825,6 @@
   return gd_putdata64(D, field_code, first_frame, first_samp, num_frames,
       num_samp, data_type, data_in);
 }
+#endif
 /* vim: ts=2 sw=2 et
 */
--- libgetdata.orig/src/index.c
+++ libgetdata/src/index.c
@@ -255,6 +255,7 @@
   return frame;
 }
 
+#if !(defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64)
 double gd_framenum_subset(DIRFILE* D, const char* field_code, double value,
     off_t field_start, off_t field_end)
 {
@@ -269,6 +270,7 @@
   dreturn("%.15g", frame);
   return frame;
 }
+#endif
 
 double gd_framenum(DIRFILE* D, const char* field_code, double value)
 {
--- libgetdata.orig/src/iopos.c
+++ libgetdata/src/iopos.c
@@ -136,10 +136,12 @@
   return pos;
 }
 
+#if !(defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64)
 off_t gd_tell(DIRFILE *D, const char *field_code) gd_nothrow
 {
   return (off_t)gd_tell64(D, field_code);
 }
+#endif
 
 off64_t _GD_DoSeek(DIRFILE *D, gd_entry_t *E, const struct encoding_t *enc,
     off64_t offset, unsigned int mode)
@@ -410,10 +412,12 @@
   return pos;
 }
 
+#if !(defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64)
 off_t gd_seek(DIRFILE *D, const char *field_code, off_t frame_num,
     off_t sample_num, int whence)
 {
   return (off_t)gd_seek64(D, field_code, frame_num, sample_num, whence);
 }
+#endif
 /* vim: ts=2 sw=2 et tw=80
 */
