mirror of
https://git.code.sf.net/p/zint/code
synced 2025-12-17 18:07:02 +00:00
modifications for VS2015, some
additional static/const's and a few bugfixes for HanXin and DotStream. Patch by Michael <virtual_worlds@gmx.de>
This commit is contained in:
@@ -36,11 +36,11 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include <windows.h>
|
||||
#include "stdint_msvc.h"
|
||||
#else
|
||||
#include <stdint.h>
|
||||
#ifdef _MSC_VER
|
||||
#include <windows.h>
|
||||
#include "stdint_msvc.h"
|
||||
#else
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
typedef struct bitmap_file_header {
|
||||
@@ -48,12 +48,12 @@ extern "C" {
|
||||
uint32_t file_size;
|
||||
uint32_t reserved;
|
||||
uint32_t data_offset;
|
||||
}
|
||||
#ifdef __GNUC__
|
||||
__attribute__((__packed__ ))
|
||||
#endif
|
||||
bitmap_file_header_t;
|
||||
|
||||
}
|
||||
#ifdef __GNUC__
|
||||
__attribute__((__packed__))
|
||||
#endif
|
||||
bitmap_file_header_t;
|
||||
|
||||
typedef struct bitmap_info_header {
|
||||
uint32_t header_size;
|
||||
int32_t width;
|
||||
@@ -66,11 +66,11 @@ extern "C" {
|
||||
int32_t vert_res;
|
||||
uint32_t colours;
|
||||
uint32_t important_colours;
|
||||
}
|
||||
#ifdef __GNUC__
|
||||
__attribute__((__packed__ ))
|
||||
#endif
|
||||
bitmap_info_header_t;
|
||||
}
|
||||
#ifdef __GNUC__
|
||||
__attribute__((__packed__))
|
||||
#endif
|
||||
bitmap_info_header_t;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user