diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
| commit | 7283e6fb73490ddd23425ba2cf06cda7ac8f9458 (patch) | |
| tree | 7c0c7069a44743b7462d3ed271bedeb09300ec4f /source/blender/imbuf/intern/dds/Stream.h | |
| parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
| parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/imbuf/intern/dds/Stream.h')
| -rw-r--r-- | source/blender/imbuf/intern/dds/Stream.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/dds/Stream.h b/source/blender/imbuf/intern/dds/Stream.h index 43cd6b56fb9..ad6b9165801 100644 --- a/source/blender/imbuf/intern/dds/Stream.h +++ b/source/blender/imbuf/intern/dds/Stream.h @@ -20,8 +20,7 @@ /* simple memory stream functions with buffer overflow check */ -#ifndef __STREAM_H__ -#define __STREAM_H__ +#pragma once struct Stream { unsigned char *mem; // location in memory @@ -40,5 +39,3 @@ unsigned int mem_read(Stream &mem, unsigned int &i); unsigned int mem_read(Stream &mem, unsigned short &i); unsigned int mem_read(Stream &mem, unsigned char &i); unsigned int mem_read(Stream &mem, unsigned char *i, unsigned int cnt); - -#endif /* __STREAM_H__ */ |