[Python-checkins] CVS: python/dist/src/Mac/Modules macmodule.c,1.50,1.51

Jack Jansen jackjansen@users.sourceforge.net
Thu, 21 Mar 2002 13:09:38 -0800


Update of /cvsroot/python/python/dist/src/Mac/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv31875

Modified Files:
	macmodule.c 
Log Message:
Solve sync() signature conflict differently: manually return 0 if
we have GUSI's void sync().


Index: macmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macmodule.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** macmodule.c	8 Dec 2001 18:02:51 -0000	1.50
--- macmodule.c	21 Mar 2002 21:09:36 -0000	1.51
***************
*** 59,67 ****
  
  #ifdef USE_GUSI2
- #define sync bad_sync
  #include <unistd.h>
  #include <fcntl.h>
- #undef sync
- int sync(void);
  #else
  #define mode_t int
--- 59,64 ----
***************
*** 644,648 ****
--- 641,650 ----
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
+ #ifdef USE_GUSI2
+ 	sync();
+ 	res = 0;
+ #else
  	res = sync();
+ #endif
  	Py_END_ALLOW_THREADS
  	if (res != 0)