[Darshan-commits] [Git][darshan/darshan][dev-fscanf-redefined] ifdef wrap in fscanf redirect case

[Shane Snyder]

Shane Snyder pushed to branch dev-fscanf-redefined at darshan / darshan


Commits:
7ff18700 by Shane Snyder at 2020-02-14T00:03:18Z
ifdef wrap in fscanf redirect case

- - - - -


1 changed file:

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


Changes:

=====================================
darshan-runtime/lib/darshan-stdio.c
=====================================
@@ -109,7 +109,9 @@ DARSHAN_FORWARD_DECL(getw, int, (FILE *stream));
 DARSHAN_FORWARD_DECL(_IO_getc, int, (FILE *stream));
 DARSHAN_FORWARD_DECL(_IO_putc, int, (int, FILE *stream));
 DARSHAN_FORWARD_DECL(fscanf, int, (FILE *stream, const char *format, ...));
+#ifndef HAVE_FSCANF_REDIRECT
 DARSHAN_FORWARD_DECL(__isoc99_fscanf, int, (FILE *stream, const char *format, ...));
+#endif
 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));
@@ -696,6 +698,7 @@ int DARSHAN_DECL(getw)(FILE *stream)
     return(ret);
 }
 
+#ifndef HAVE_FSCANF_REDIRECT
 /* NOTE: some glibc versions use __isoc99_fscanf as the underlying symbol
  * rather than fscanf
  */
@@ -726,7 +729,7 @@ int DARSHAN_DECL(__isoc99_fscanf)(FILE *stream, const char *format, ...)
 
     return(ret);
 }
-
+#endif
 
 int DARSHAN_DECL(fscanf)(FILE *stream, const char *format, ...)
 {



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/7ff18700b2e036ccb185e9fe950884be3d2a465d

-- 
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/7ff18700b2e036ccb185e9fe950884be3d2a465d
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/20200213/5518b796/attachment-0001.html>