[Darshan-commits] [Git][darshan/darshan][master] 2 commits: bugfix to enable compilation on 32-bit platforms (resolves #252)

[Shane Snyder]

Shane Snyder pushed to branch master at darshan / darshan


Commits:
ddc4cbb4 by Glenn K. Lockwood at 2018-11-24T17:46:38Z
bugfix to enable compilation on 32-bit platforms (resolves #252)

- - - - -
f119346b by Shane Snyder at 2018-11-27T17:26:17Z
Merge branch 'bugfix-32bit' into 'master'

bugfix to enable compilation on 32-bit platforms (resolves #252)

Closes #252

See merge request darshan/darshan!26
- - - - -


2 changed files:

- darshan-runtime/lib/darshan-posix.c
- darshan-runtime/lib/darshan-stdio.c


Changes:

=====================================
darshan-runtime/lib/darshan-posix.c
=====================================
@@ -771,7 +771,7 @@ off_t DARSHAN_DECL(lseek)(int fd, off_t offset, int whence)
     return(ret);
 }
 
-off_t DARSHAN_DECL(lseek64)(int fd, off_t offset, int whence)
+off64_t DARSHAN_DECL(lseek64)(int fd, off64_t offset, int whence)
 {
     off_t ret;
     struct posix_file_record_ref *rec_ref;


=====================================
darshan-runtime/lib/darshan-stdio.c
=====================================
@@ -84,6 +84,10 @@
 #include "darshan.h"
 #include "darshan-dynamic.h"
 
+#ifndef HAVE_OFF64_T
+typedef int64_t off64_t;
+#endif
+
 DARSHAN_FORWARD_DECL(fopen, FILE*, (const char *path, const char *mode));
 DARSHAN_FORWARD_DECL(fopen64, FILE*, (const char *path, const char *mode));
 DARSHAN_FORWARD_DECL(fdopen, FILE*, (int fd, const char *mode));
@@ -110,7 +114,7 @@ DARSHAN_FORWARD_DECL(vfscanf, int, (FILE *stream, const char *format, va_list ap
 DARSHAN_FORWARD_DECL(fgets, char*, (char *s, int size, FILE *stream));
 DARSHAN_FORWARD_DECL(fseek, int, (FILE *stream, long offset, int whence));
 DARSHAN_FORWARD_DECL(fseeko, int, (FILE *stream, off_t offset, int whence));
-DARSHAN_FORWARD_DECL(fseeko64, int, (FILE *stream, off_t offset, int whence));
+DARSHAN_FORWARD_DECL(fseeko64, int, (FILE *stream, off64_t offset, int whence));
 DARSHAN_FORWARD_DECL(fsetpos, int, (FILE *stream, const fpos_t *pos));
 DARSHAN_FORWARD_DECL(fsetpos64, int, (FILE *stream, const fpos64_t *pos));
 DARSHAN_FORWARD_DECL(rewind, void, (FILE *stream));
@@ -856,7 +860,7 @@ int DARSHAN_DECL(fseeko)(FILE *stream, off_t offset, int whence)
     return(ret);
 }
 
-int DARSHAN_DECL(fseeko64)(FILE *stream, off_t offset, int whence)
+int DARSHAN_DECL(fseeko64)(FILE *stream, off64_t offset, int whence)
 {
     int ret;
     struct stdio_file_record_ref *rec_ref;



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/compare/be086b444241ef5b641c6a763f532ce96db261b7...f119346b2e441459c026c0f5ef6f2b5c2a56c942

-- 
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/compare/be086b444241ef5b641c6a763f532ce96db261b7...f119346b2e441459c026c0f5ef6f2b5c2a56c942
You're receiving this email because of your account on xgitlab.cels.anl.gov.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20181127/533e0a78/attachment-0001.html>