From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 22 Feb 2015 19:34:54 +0000 (+0200)
Subject: Issue #23152: Move declarations back to posixmodule.c.
X-Git-Tag: v3.5.0a2~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06a13f81ea6293b9aa516a7b2f07f217f8cabb01;p=thirdparty%2FPython%2Fcpython.git

Issue #23152: Move declarations back to posixmodule.c.

Declarations of Windows-specific auxilary functions need Windows types
from windows.h.  Instead of including windows.h in Python.h and making
it available to all Windows users, it is simpler and safer just move
declarations to the single file that needs them.
---

diff --git a/Include/fileutils.h b/Include/fileutils.h
index 5ddd51162234..bb9048116d7b 100644
--- a/Include/fileutils.h
+++ b/Include/fileutils.h
@@ -42,10 +42,6 @@ struct _Py_stat_struct {
     int st_ctime_nsec;
     unsigned long st_file_attributes;
 };
-
-PyAPI_FUNC(void) _Py_time_t_to_FILE_TIME(time_t, int, FILETIME *);
-PyAPI_FUNC(void) _Py_attribute_data_to_stat(BY_HANDLE_FILE_INFORMATION *,
-                                            ULONG, struct _Py_stat_struct *);
 #else
 #  define _Py_stat_struct stat
 #endif
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 945c9d01ecfa..e381bf1bbbad 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -372,6 +372,12 @@ static int win32_can_symlink = 0;
 
 #define DWORD_MAX 4294967295U
 
+#ifdef MS_WINDOWS
+/* defined in fileutils.c */
+PyAPI_FUNC(void) _Py_time_t_to_FILE_TIME(time_t, int, FILETIME *);
+PyAPI_FUNC(void) _Py_attribute_data_to_stat(BY_HANDLE_FILE_INFORMATION *,
+                                            ULONG, struct _Py_stat_struct *);
+#endif
 
 #ifdef MS_WINDOWS
 static int