You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

34 lines
1.0 KiB

  1. --- a/lib/hgfs/hgfsUtil.c
  2. +++ b/lib/hgfs/hgfsUtil.c
  3. @@ -109,7 +109,7 @@ int
  4. HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format
  5. uint64 ntTime) // IN: Time in Windows NT format
  6. {
  7. -#ifdef __i386__
  8. +#if defined(__i386__) && !__USE_TIME_BITS64
  9. uint32 sec;
  10. uint32 nsec;
  11. @@ -134,7 +134,7 @@ HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format
  12. return -1;
  13. }
  14. -#ifdef __i386__
  15. +#if defined(__i386__) && !__USE_TIME_BITS64
  16. Div643232(ntTime - UNIX_EPOCH, 10000000, &sec, &nsec);
  17. unixTime->tv_sec = sec;
  18. unixTime->tv_nsec = nsec * 100;
  19. --- a/lib/hgfsServer/hgfsServerLinux.c
  20. +++ b/lib/hgfsServer/hgfsServerLinux.c
  21. @@ -2569,7 +2569,11 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information
  22. # define FMTTIMET "l"
  23. # endif
  24. #else
  25. +#ifdef __USE_TIME_BITS64
  26. +# define FMTTIMET __PRI64
  27. +#else
  28. # define FMTTIMET "l"
  29. +#endif
  30. #endif
  31. LOG(4, "access: %"FMTTIMET"d/%"FMT64"u \nwrite: %"FMTTIMET"d/%"FMT64"u \n"
  32. "attr: %"FMTTIMET"d/%"FMT64"u\n",