From 532e29cd76ba006db372f86e9c38c4d312d45fca Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Jun 2015 09:40:17 +1000 Subject: Win32: make DIR struct opaque --- source/blender/blenlib/BLI_winstuff.h | 13 ++----------- source/blender/blenlib/intern/winstuff_dir.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 11 deletions(-) (limited to 'source') diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h index f40359ec3dc..8cf6f188e19 100644 --- a/source/blender/blenlib/BLI_winstuff.h +++ b/source/blender/blenlib/BLI_winstuff.h @@ -132,17 +132,8 @@ struct dirent { char *d_name; }; -typedef struct _DIR { - HANDLE handle; - WIN32_FIND_DATAW data; - char path[MAX_PATH]; - long dd_loc; - long dd_size; - char dd_buf[4096]; - void *dd_direct; - - struct dirent direntry; -} DIR; +/* intentionally opaque to users */ +typedef struct __dirstream DIR; DIR *opendir(const char *path); struct dirent *readdir(DIR *dp); diff --git a/source/blender/blenlib/intern/winstuff_dir.c b/source/blender/blenlib/intern/winstuff_dir.c index b20da9ce959..30247f2feb0 100644 --- a/source/blender/blenlib/intern/winstuff_dir.c +++ b/source/blender/blenlib/intern/winstuff_dir.c @@ -44,6 +44,19 @@ #include "BLI_utildefines.h" #include "utfconv.h" +/* keep local to this file */ +struct __dirstream { + HANDLE handle; + WIN32_FIND_DATAW data; + char path[MAX_PATH]; + long dd_loc; + long dd_size; + char dd_buf[4096]; + void *dd_direct; + + struct dirent direntry; +}; + /* Note: MinGW (FREE_WINDOWS) has opendir() and _wopendir(), and only the * latter accepts a path name of wchar_t type. Rather than messing up with * extra #ifdef's here and there, Blender's own implementations of opendir() -- cgit v1.2.3