mirror of
https://git.freebsd.org/ports.git
synced 2025-05-20 11:03:09 -04:00
6fbe3e61ee
Also unbreak port on FreeBSD 13+. Submitter becomes maintainer. PR: 252188 Approved by: brittlehaus@gmail.com (maintainer timeout)
46 lines
1.4 KiB
C
46 lines
1.4 KiB
C
--- portmidi/porttime/ptlinux.c.orig 2020-07-07 04:53:18 UTC
|
|
+++ portmidi/porttime/ptlinux.c
|
|
@@ -31,14 +31,13 @@ CHANGE LOG
|
|
#include "porttime.h"
|
|
#include "sys/time.h"
|
|
#include "sys/resource.h"
|
|
-#include "sys/timeb.h"
|
|
#include "pthread.h"
|
|
|
|
#define TRUE 1
|
|
#define FALSE 0
|
|
|
|
static int time_started_flag = FALSE;
|
|
-static struct timeb time_offset = {0, 0, 0, 0};
|
|
+static struct timespec time_offset = {0, 0};
|
|
static pthread_t pt_thread_pid;
|
|
static int pt_thread_created = FALSE;
|
|
|
|
@@ -79,7 +78,7 @@ static void *Pt_CallbackProc(void *p)
|
|
PtError Pt_Start(int resolution, PtCallback *callback, void *userData)
|
|
{
|
|
if (time_started_flag) return ptNoError;
|
|
- ftime(&time_offset); /* need this set before process runs */
|
|
+ clock_gettime(CLOCK_MONOTONIC, &time_offset); /* need this set before process runs */
|
|
if (callback) {
|
|
int res;
|
|
pt_callback_parameters *parms = (pt_callback_parameters *)
|
|
@@ -120,12 +119,12 @@ int Pt_Started()
|
|
|
|
PtTimestamp Pt_Time()
|
|
{
|
|
- long seconds, milliseconds;
|
|
- struct timeb now;
|
|
- ftime(&now);
|
|
- seconds = now.time - time_offset.time;
|
|
- milliseconds = now.millitm - time_offset.millitm;
|
|
- return seconds * 1000 + milliseconds;
|
|
+ long seconds, nanoseconds;
|
|
+ struct timespec now;
|
|
+ clock_gettime(CLOCK_MONOTONIC, &now);
|
|
+ seconds = now.tv_sec - time_offset.tv_sec;
|
|
+ nanoseconds = now.tv_nsec - time_offset.tv_nsec;
|
|
+ return seconds * 1000 + nanoseconds / 1000000;
|
|
}
|
|
|
|
|