Fix MSVC build issues

This commit is contained in:
Cameron Gutman 2018-09-25 00:56:43 -07:00
parent dd7820f100
commit 487a62f58c
5 changed files with 8 additions and 18 deletions

View File

@ -4,6 +4,8 @@
#pragma once
#include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif
@ -392,7 +394,7 @@ int LiSendScrollEvent(signed char scrollClicks);
// This function returns a time in milliseconds with an implementation-defined epoch.
// NOTE: This will be populated from gettimeofday() if !HAVE_CLOCK_GETTIME and
// populated from clock_gettime(CLOCK_MONOTONIC) if HAVE_CLOCK_GETTIME.
unsigned long long LiGetMillis(void);
uint64_t LiGetMillis(void);
#ifdef __cplusplus
}

View File

@ -89,6 +89,6 @@ void LiInitializeServerInformation(PSERVER_INFORMATION serverInfo) {
memset(serverInfo, 0, sizeof(*serverInfo));
}
unsigned long long LiGetMillis(void) {
uint64_t LiGetMillis(void) {
return PltGetMillis();
}

View File

@ -16,19 +16,6 @@ struct thread_context {
static int running_threads = 0;
#if defined(LC_WINDOWS)
void LimelogWindows(char* Format, ...) {
va_list va;
char buffer[1024];
va_start(va, Format);
vsprintf(buffer, Format, va);
va_end(va);
OutputDebugStringA(buffer);
}
#endif
#if defined(LC_WINDOWS)
DWORD WINAPI ThreadProc(LPVOID lpParameter) {
struct thread_context* ctx = (struct thread_context*)lpParameter;
@ -293,7 +280,7 @@ int PltWaitForEvent(PLT_EVENT* event) {
#endif
}
unsigned long long PltGetMillis(void) {
uint64_t PltGetMillis(void) {
#if defined(LC_WINDOWS)
return GetTickCount64();
#elif HAVE_CLOCK_GETTIME

View File

@ -2,6 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
@ -62,4 +63,4 @@
int initializePlatform(void);
void cleanupPlatform(void);
unsigned long long PltGetMillis(void);
uint64_t PltGetMillis(void);

View File

@ -8,7 +8,7 @@
typedef struct _RTP_QUEUE_ENTRY {
PRTP_PACKET packet;
unsigned long long queueTimeMs;
uint64_t queueTimeMs;
struct _RTP_QUEUE_ENTRY* next;
struct _RTP_QUEUE_ENTRY* prev;