From: Jack Jansen <jack.jansen@cwi.nl>
Date: Thu, 21 Mar 2002 21:09:36 +0000 (+0000)
Subject: Solve sync() signature conflict differently: manually return 0 if
X-Git-Tag: v2.3c1~6420
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e5a7338877c7ef0f8e021e7390f9d6cf80d7875;p=thirdparty%2FPython%2Fcpython.git

Solve sync() signature conflict differently: manually return 0 if
we have GUSI's void sync().
---

diff --git a/Mac/Modules/macmodule.c b/Mac/Modules/macmodule.c
index 7f80b19f4c8c..93dfaee1bf87 100644
--- a/Mac/Modules/macmodule.c
+++ b/Mac/Modules/macmodule.c
@@ -58,11 +58,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #endif /* USE_GUSI */
 
 #ifdef USE_GUSI2
-#define sync bad_sync
 #include <unistd.h>
 #include <fcntl.h>
-#undef sync
-int sync(void);
 #else
 #define mode_t int
 #include <fcntl.h>
@@ -643,7 +640,12 @@ mac_sync(self, args)
 	if (!PyArg_ParseTuple(args, ""))
 		return NULL;
 	Py_BEGIN_ALLOW_THREADS
+#ifdef USE_GUSI2
+	sync();
+	res = 0;
+#else
 	res = sync();
+#endif
 	Py_END_ALLOW_THREADS
 	if (res != 0)
 		return mac_error();