More build fixes.

[thirdparty/cups.git] / cups / dir.c

diff --git a/cups/dir.c b/cups/dir.c
index b7cd400cbd268a2075ee87af19852198a476ba50..798e4e8b9fabbc0f1f0503616248c5c9a1ff0988 100644 (file)
--- a/cups/dir.c
+++ b/cups/dir.c
@@ -6,11 +6,7 @@
  * Copyright 2007-2017 by Apple Inc.
  * Copyright 1997-2005 by Easy Software Products, all rights reserved.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * missing or damaged, see the license at "http://www.cups.org/".
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
  */
 
 /*
@@ -26,7 +22,7 @@
  * Windows implementation...
  */
 
-#ifdef WIN32
+#ifdef _WIN32
 #  include <windows.h>
 
 /*
@@ -145,7 +141,7 @@ cupsDirOpen(const char *directory)  /* I - Directory name */
 cups_dentry_t *                                /* O - Directory entry or @code NULL@ if there are no more */
 cupsDirRead(cups_dir_t *dp)            /* I - Directory pointer */
 {
-  WIN32_FIND_DATA      entry;          /* Directory entry data */
+  WIN32_FIND_DATAA     entry;          /* Directory entry data */
 
 
  /*
@@ -165,11 +161,11 @@ cupsDirRead(cups_dir_t *dp)               /* I - Directory pointer */
     * No, find the first file...
     */
 
-    dp->dir = FindFirstFile(dp->directory, &entry);
+    dp->dir = FindFirstFileA(dp->directory, &entry);
     if (dp->dir == INVALID_HANDLE_VALUE)
       return (NULL);
   }
-  else if (!FindNextFile(dp->dir, &entry))
+  else if (!FindNextFileA(dp->dir, &entry))
     return (NULL);
 
  /*
@@ -422,4 +418,4 @@ cupsDirRewind(cups_dir_t *dp)               /* I - Directory pointer */
 
   rewinddir(dp->dir);
 }
-#endif /* WIN32 */
+#endif /* _WIN32 */