Changeset 391 for python/trunk/Include/fileobject.h

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Include/fileobject.h (modified) (2 diffs)

python/trunk/Include/fileobject.h

@@ -9 +9 @@
 
 typedef struct {
-        PyObject_HEAD
-        FILE *f_fp;
-        PyObject *f_name;
-        PyObject *f_mode;
-        int (*f_close)(FILE *);
-        int f_softspace;        /* Flag used by 'print' command */
-        int f_binary;           /* Flag which indicates whether the file is 
-                                   open in binary (1) or text (0) mode */
-        char* f_buf;            /* Allocated readahead buffer */
-        char* f_bufend;         /* Points after last occupied position */
-        char* f_bufptr;         /* Current buffer position */
-        char *f_setbuf;         /* Buffer for setbuf(3) and setvbuf(3) */
-        int f_univ_newline;     /* Handle any newline convention */
-        int f_newlinetypes;     /* Types of newlines seen */
-        int f_skipnextlf;       /* Skip next \n */
-        PyObject *f_encoding;
-        PyObject *f_errors;
-        PyObject *weakreflist; /* List of weak references */
-        int unlocked_count;     /* Num. currently running sections of code
-                                   using f_fp with the GIL released. */
-        int readable;
-        int writable;
+    PyObject_HEAD
+    FILE *f_fp;
+    PyObject *f_name;
+    PyObject *f_mode;
+    int (*f_close)(FILE *);
+    int f_softspace;            /* Flag used by 'print' command */
+    int f_binary;               /* Flag which indicates whether the file is
+                               open in binary (1) or text (0) mode */
+    char* f_buf;                /* Allocated readahead buffer */
+    char* f_bufend;             /* Points after last occupied position */
+    char* f_bufptr;             /* Current buffer position */
+    char *f_setbuf;             /* Buffer for setbuf(3) and setvbuf(3) */
+    int f_univ_newline;         /* Handle any newline convention */
+    int f_newlinetypes;         /* Types of newlines seen */
+    int f_skipnextlf;           /* Skip next \n */
+    PyObject *f_encoding;
+    PyObject *f_errors;
+    PyObject *weakreflist; /* List of weak references */
+    int unlocked_count;         /* Num. currently running sections of code
+                               using f_fp with the GIL released. */
+    int readable;
+    int writable;
 } PyFileObject;
 
@@ -71 +71 @@
 int _PyFile_SanitizeMode(char *mode);
 
+#if defined _MSC_VER && _MSC_VER >= 1400
+/* A routine to check if a file descriptor is valid on Windows.  Returns 0
+ * and sets errno to EBADF if it isn't.  This is to avoid Assertions
+ * from various functions in the Windows CRT beginning with
+ * Visual Studio 2005
+ */
+int _PyVerify_fd(int fd);
+#elif defined _MSC_VER && _MSC_VER >= 1200
+/* fdopen doesn't set errno EBADF and crashes for large fd on debug build */
+#define _PyVerify_fd(fd) (_get_osfhandle(fd) >= 0)
+#else
+#define _PyVerify_fd(A) (1) /* dummy */
+#endif
+
+/* A routine to check if a file descriptor can be select()-ed. */
+#ifdef HAVE_SELECT
+ #define _PyIsSelectable_fd(FD) (((FD) >= 0) && ((FD) < FD_SETSIZE))
+#else
+ #define _PyIsSelectable_fd(FD) (1)
+#endif /* HAVE_SELECT */
+
 #ifdef __cplusplus
 }