[Python-checkins] r73876 - in python/branches/release31-maint: Modules/nismodule.c

[amaury.forgeotdarc]

Author: amaury.forgeotdarc
Date: Tue Jul  7 08:53:22 2009
New Revision: 73876

Log:
Merged revisions 73874 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r73874 | amaury.forgeotdarc | 2009-07-07 08:51:26 +0200 (mar., 07 juil. 2009) | 9 lines
  
  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/release31-maint/   (props changed)
   python/branches/release31-maint/Modules/nismodule.c

Modified: python/branches/release31-maint/Modules/nismodule.c
==============================================================================
--- python/branches/release31-maint/Modules/nismodule.c	(original)
+++ python/branches/release31-maint/Modules/nismodule.c	Tue Jul  7 08:53:22 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 *);