morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

libwinpr-synch: fix compilation on Windows

Browse Source
This commit is contained in:
Marc-André Moreau
2012-09-19 03:07:47 +02:00
parent 36122bea94
commit 9cc76d0b02
4 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libfreerdp/utils/bitmap.c
View File

@@ -31,7 +31,7 @@
typedef struct
{
uint8 magic[2];
} bmpfile_magic;
} BITMAP_MAGIC;
typedef struct
{
@@ -39,7 +39,7 @@ typedef struct
uint16 creator1;
uint16 creator2;
uint32 bmp_offset;
} bmpfile_header;
} BITMAP_CORE_HEADER;
typedef struct
{
@@ -54,14 +54,14 @@ typedef struct
sint32 vres;
uint32 ncolors;
uint32 nimpcolors;
} BITMAPINFOHEADER;
} BITMAP_INFO_HEADER;
void freerdp_bitmap_write(char* filename, void* data, int width, int height, int bpp)
{
FILE* fp;
bmpfile_magic magic;
bmpfile_header header;
BITMAPINFOHEADER info_header;
BITMAP_MAGIC magic;
BITMAP_CORE_HEADER header;
BITMAP_INFO_HEADER info_header;
fp = fopen(filename, "w+b");
@@ -78,9 +78,9 @@ void freerdp_bitmap_write(char* filename, void* data, int width, int height, int
header.creator2 = 0;
header.bmp_offset =
sizeof(bmpfile_magic) +
sizeof(bmpfile_header) +
sizeof(BITMAPINFOHEADER);
sizeof(BITMAP_MAGIC) +
sizeof(BITMAP_CORE_HEADER) +
sizeof(BITMAP_INFO_HEADER);
info_header.bmp_bytesz = width * height * (bpp / 8);
@@ -99,9 +99,9 @@ void freerdp_bitmap_write(char* filename, void* data, int width, int height, int
info_header.nimpcolors = 0;
info_header.header_sz = sizeof(BITMAPINFOHEADER);
fwrite((void*) &magic, sizeof(bmpfile_magic), 1, fp);
fwrite((void*) &header, sizeof(bmpfile_header), 1, fp);
fwrite((void*) &info_header, sizeof(BITMAPINFOHEADER), 1, fp);
fwrite((void*) &magic, sizeof(BITMAP_MAGIC), 1, fp);
fwrite((void*) &header, sizeof(BITMAP_CORE_HEADER), 1, fp);
fwrite((void*) &info_header, sizeof(BITMAP_INFO_HEADER), 1, fp);
fwrite((void*) data, info_header.bmp_bytesz, 1, fp);
fclose(fp);

11
libfreerdp/utils/pcap.c
View File

@@ -29,19 +29,12 @@
#else
#include <time.h>
#include <sys/timeb.h>
#if !defined(__MINGW32__) && !defined(__MINGW64__)
struct timeval
{
long tv_sec;
long tv_usec;
};
#endif
#include <winpr/windows.h>
int gettimeofday(struct timeval* tp, void* tz)
{
struct _timeb timebuffer;
_ftime (&timebuffer);
_ftime(&timebuffer);
tp->tv_sec = (long) timebuffer.time;
tp->tv_usec = timebuffer.millitm * 1000;
return 0;