mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-11-26 03:12:18 -05:00
Fixed merge/rebase issues
This commit is contained in:
parent
3bb234e6a6
commit
9d12813282
@ -1,8 +1,14 @@
|
||||
#ifndef COLOR_H
|
||||
#define COLOR_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include "endianness.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
uint8_t r, g, b;
|
||||
} Color_RGB8;
|
||||
@ -15,9 +21,9 @@ typedef struct {
|
||||
typedef union {
|
||||
struct {
|
||||
#ifdef IS_BIGENDIAN
|
||||
u8 r, g, b, a;
|
||||
uint8_t r, g, b, a;
|
||||
#else
|
||||
u8 a, b, g, r;
|
||||
uint8_t a, b, g, r;
|
||||
#endif
|
||||
};
|
||||
uint32_t rgba;
|
||||
|
Loading…
Reference in New Issue
Block a user