[Python-checkins] r73875 - in python/branches/release26-maint: Modules/nismodule.c

Tue Jul 7 08:52:04 CEST 2009

Author: amaury.forgeotdarc
Date: Tue Jul 7 08:52:04 2009
New Revision: 73875
Log:
Merged revisions 73873 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r73873 | amaury.forgeotdarc | 2009年07月07日 08:49:41 +0200 (mar., 07 juil. 2009) | 2 lines
 
 #6420: Fix a compilation warning in the nis module, for OpenBSD and FreeBSD.
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Modules/nismodule.c
Modified: python/branches/release26-maint/Modules/nismodule.c
==============================================================================

--- python/branches/release26-maint/Modules/nismodule.c	(original)
+++ python/branches/release26-maint/Modules/nismodule.c	Tue Jul 7 08:52:04 2009
@@ -89,7 +89,7 @@
 	return map;
 }
 
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__)
 typedef int (*foreachfunc)(unsigned long, char *, int, char *, int, void *);
 #else
 typedef int (*foreachfunc)(int, char *, int, char *, int, char *);
