projects
/
asdcplib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
o Replaced WIN32 directory scanner with dirent_win.h
[asdcplib.git]
/
src
/
KM_fileio.h
diff --git
a/src/KM_fileio.h
b/src/KM_fileio.h
index 18dcf0ec11e9668b1751e8206bf8fac1d3117795..264509a601e8384493ae86b0f57e913b999955d7 100755
(executable)
--- a/
src/KM_fileio.h
+++ b/
src/KM_fileio.h
@@
-1,5
+1,5
@@
/*
/*
-Copyright (c) 2004-201
4
, John Hurst
+Copyright (c) 2004-201
6
, John Hurst
All rights reserved.
Redistribution and use in source and binary forms, with or without
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@
-37,6
+37,7
@@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifdef KM_WIN32
# include <io.h>
#ifdef KM_WIN32
# include <io.h>
+# include "dirent_win.h"
#else
# include <dirent.h>
# include <unistd.h>
#else
# include <dirent.h>
# include <unistd.h>
@@
-55,12
+56,7
@@
namespace Kumu
class DirScanner
{
public:
class DirScanner
{
public:
-#ifdef KM_WIN32
- __int64 m_Handle;
- struct _finddatai64_t m_FileInfo;
-#else
DIR* m_Handle;
DIR* m_Handle;
-#endif
DirScanner(void);
~DirScanner() { Close(); }
DirScanner(void);
~DirScanner() { Close(); }
@@
-83,12
+79,7
@@
namespace Kumu
class DirScannerEx
{
std::string m_Dirname;
class DirScannerEx
{
std::string m_Dirname;
-#ifdef KM_WIN32
- __int64 m_Handle;
- struct _finddatai64_t m_FileInfo;
-#else
DIR* m_Handle;
DIR* m_Handle;
-#endif
KM_NO_COPY_CONSTRUCT(DirScannerEx);
KM_NO_COPY_CONSTRUCT(DirScannerEx);