Commit 12bed9ff authored by unknown's avatar unknown
Browse files

Fix up definition of new set_timespec_nsec() macro. (Related to bug #12582) 


include/my_global.h:
  Add distinct set_timespec_nsec() macro for when HAVE_TIMESPEC_TS_SEC
  is defined.
parent cbdd54e4

include/my_global.h

+13 −4
Original line number Diff line number Diff line
@@ -927,7 +927,17 @@ typedef char bool; /* Ordinary boolean values 0 1 */ 


#ifndef set_timespec

#ifdef HAVE_TIMESPEC_TS_SEC

#define set_timespec(ABSTIME,SEC) { (ABSTIME).ts_sec=time(0) + (time_t) (SEC); (ABSTIME).ts_nsec=0; }

#define set_timespec(ABSTIME,SEC) \

{ \

  (ABSTIME).ts_sec=time(0) + (time_t) (SEC); \

  (ABSTIME).ts_nsec=0; \

}

#define set_timespec_nsec(ABSTIME,NSEC) \

{\

  ulonglong now= my_getsystime(); \

  (ABSTIME).ts_sec= (now / ULL(10000000)) + (NSEC / ULL(1000000000)); \

  (ABSTIME).ts_nsec= (now % ULL(10000000)) * 100 + (NSEC % ULL(1000000000)); \

}

#else

#define set_timespec(ABSTIME,SEC) \

{\
@@ -936,15 +946,14 @@ typedef char bool; /* Ordinary boolean values 0 1 */ 
  (ABSTIME).tv_sec=tv.tv_sec+(time_t) (SEC);\

  (ABSTIME).tv_nsec=tv.tv_usec*1000;\

}

#endif /* HAVE_TIMESPEC_TS_SEC */

#endif /* set_timespec */



#define set_timespec_nsec(ABSTIME,NSEC) \

{\

  ulonglong now= my_getsystime(); \

  (ABSTIME).tv_sec= (now / ULL(10000000)) + (NSEC / ULL(1000000000)); \

  (ABSTIME).tv_nsec= (now % ULL(10000000)) * 100 + (NSEC % ULL(1000000000)); \

}

#endif /* HAVE_TIMESPEC_TS_SEC */

#endif /* set_timespec */



/*

  Define-funktions for reading and storing in machine independent format