diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2019-10-15 04:47:07 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2019-10-15 04:47:07 +0300 |
| commit | a4ef7a27d2466fcdefd41fe0991bb63950b9e77d (patch) | |
| tree | eec980986028f42353cca146f7e8dad9af8f575c /source/blender/blenlib | |
| parent | b2d83a0697548ead851f8ba6fe27d525b8f9f85e (diff) | |
| parent | abd7ad01b84a291f7fdb2e6d1374b7ac1007e3be (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_gsqueue.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/storage.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_gsqueue.h b/source/blender/blenlib/BLI_gsqueue.h index 4bd53dfddbe..b8a87e9d9fa 100644 --- a/source/blender/blenlib/BLI_gsqueue.h +++ b/source/blender/blenlib/BLI_gsqueue.h @@ -26,7 +26,7 @@ typedef struct _GSQueue GSQueue; -GSQueue *BLI_gsqueue_new(size_t elem_size); +GSQueue *BLI_gsqueue_new(const size_t elem_size); bool BLI_gsqueue_is_empty(const GSQueue *gq); size_t BLI_gsqueue_len(const GSQueue *gq); void BLI_gsqueue_pop(GSQueue *gq, void *r_item); diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 05a2d766fe0..fd5de717a24 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -209,7 +209,6 @@ int BLI_exists(const char *name) BLI_stat_t st; wchar_t *tmp_16 = alloc_utf16_from_8(name, 1); int len, res; - unsigned int old_error_mode; len = wcslen(tmp_16); /* in Windows #stat doesn't recognize dir ending on a slash |