[PyObjC-svn] r2560 - in branches/pyobjc-2.3.x: . pyobjc-framework-CFNetwork/Modules

Author: ronaldoussoren
Date: Tue Aug 10 04:56:32 2010
New Revision: 2560

Log:
Merged revisions 2559 via svnmerge from 
https://svn.red-bean.com/pyobjc/trunk/pyobjc

........
  r2559 | ronaldoussoren | 2010-08-10 11:38:28 +0200 (Tue, 10 Aug 2010) | 2 lines
  
  Tweak sources to ensure the manual bindings can be compiled on a 10.5 system.
........


Modified:
   branches/pyobjc-2.3.x/   (props changed)
   branches/pyobjc-2.3.x/pyobjc-framework-CFNetwork/Modules/_manual.m

Modified: branches/pyobjc-2.3.x/pyobjc-framework-CFNetwork/Modules/_manual.m
==============================================================================
--- branches/pyobjc-2.3.x/pyobjc-framework-CFNetwork/Modules/_manual.m	(original)
+++ branches/pyobjc-2.3.x/pyobjc-framework-CFNetwork/Modules/_manual.m	Tue Aug 10 04:56:32 2010
@@ -120,7 +120,8 @@
 }
 
 
-#if PyObjC_BUILD_RELEASE >= 1005
+#if PyObjC_BUILD_RELEASE >= 1006
+  /* This function is available on 10.5 or later, but the prototype isn't in the headers on 10.5 */
 static PyObject*
 m_CFNetworkExecuteProxyAutoConfigurationScript(PyObject* mod __attribute__((__unused__)),
 		PyObject* args)
@@ -304,13 +305,15 @@
 
 
 static PyMethodDef mod_methods[] = {
-#if PyObjC_BUILD_RELEASE >= 1005
+#if PyObjC_BUILD_RELEASE >= 1006
 	{
 		"CFNetworkExecuteProxyAutoConfigurationScript",
 		(PyCFunction)m_CFNetworkExecuteProxyAutoConfigurationScript,
 		METH_VARARGS,
 		NULL
 	},
+#endif /* OSX >= 10.5 */
+#if PyObjC_BUILD_RELEASE >= 1005
 	{
 		"CFNetworkExecuteProxyAutoConfigurationURL",
 		(PyCFunction)m_CFNetworkExecuteProxyAutoConfigurationURL,
@@ -342,12 +345,14 @@
 		PyObjC_INITERROR();
 	}
 
-#if PyObjC_BUILD_RELEASE >= 1005
+#if PyObjC_BUILD_RELEASE >= 1006
 	if (CFNetworkExecuteProxyAutoConfigurationScript == NULL) {
 		if (PyDict_DelItemString(m, "CFNetworkExecuteProxyAutoConfigurationScript") < 0) {
 			PyObjC_INITERROR();
 		}
 	}
+#endif
+#if PyObjC_BUILD_RELEASE >= 1005
 	if (CFNetworkExecuteProxyAutoConfigurationURL == NULL) {
 		if (PyDict_DelItemString(m, "CFNetworkExecuteProxyAutoConfigurationURL") < 0) {
 			PyObjC_INITERROR();

------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev