[PHP-CVS] cvs: php-src /ext/standard file.c

[Wez Furlong]

wez             Sun Dec 12 18:21:57 2004 EDT

  Modified files:              
    /php-src/ext/standard       file.c 
  Log:
  Add missing constants for socketpair().
  I thought I had included these...
  Good catch Nuno :)
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.394&r2=1.395&ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.394 php-src/ext/standard/file.c:1.395
--- php-src/ext/standard/file.c:1.394   Sun Dec 12 11:10:35 2004
+++ php-src/ext/standard/file.c Sun Dec 12 18:21:53 2004
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: file.c,v 1.394 2004/12/12 16:10:35 wez Exp $ */
+/* $Id: file.c,v 1.395 2004/12/12 23:21:53 wez Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -229,6 +229,39 @@
        REGISTER_LONG_CONSTANT("STREAM_CRYPTO_METHOD_SSLv3_SERVER",             
STREAM_CRYPTO_METHOD_SSLv3_SERVER,      CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("STREAM_CRYPTO_METHOD_SSLv23_SERVER",    
STREAM_CRYPTO_METHOD_SSLv23_SERVER,     CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("STREAM_CRYPTO_METHOD_TLS_SERVER",               
STREAM_CRYPTO_METHOD_TLS_SERVER,        CONST_CS|CONST_PERSISTENT);
+       
+#ifdef PF_INET
+       REGISTER_LONG_CONSTANT("STREAM_PF_INET", PF_INET, 
CONST_CS|CONST_PERSISTENT);
+#elif defined(AF_INET)
+       REGISTER_LONG_CONSTANT("STREAM_PF_INET", AF_INET, 
CONST_CS|CONST_PERSISTENT);
+#endif
+#ifdef PF_INET6
+       REGISTER_LONG_CONSTANT("STREAM_PF_INET6", PF_INET6, 
CONST_CS|CONST_PERSISTENT);
+#elif defined(AF_INET6)
+       REGISTER_LONG_CONSTANT("STREAM_PF_INET6", AF_INET6, 
CONST_CS|CONST_PERSISTENT);
+#endif
+#ifdef PF_UNIX
+       REGISTER_LONG_CONSTANT("STREAM_PF_UNIX", PF_UNIX, 
CONST_CS|CONST_PERSISTENT);
+#elif defined(AF_UNIX)
+       REGISTER_LONG_CONSTANT("STREAM_PF_UNIX", AF_UNIX, 
CONST_CS|CONST_PERSISTENT);
+#endif
+
+#ifdef IPPROTO_IP
+       /* most people will use this one when calling socket() or socketpair() 
*/
+       REGISTER_LONG_CONSTANT("STREAM_IPPROTO_IP", IPPROTO_IP, 
CONST_CS|CONST_PERSISTENT);
+#endif
+#ifdef IPPROTO_TCP
+       REGISTER_LONG_CONSTANT("STREAM_IPPROTO_TCP", IPPROTO_TCP, 
CONST_CS|CONST_PERSISTENT);
+#endif
+#ifdef IPPROTO_UDP
+       REGISTER_LONG_CONSTANT("STREAM_IPPROTO_UDP", IPPROTO_UDP, 
CONST_CS|CONST_PERSISTENT);
+#endif
+#ifdef IPPROTO_ICMP
+       REGISTER_LONG_CONSTANT("STREAM_IPPROTO_ICMP", IPPROTO_ICMP, 
CONST_CS|CONST_PERSISTENT);
+#endif
+#ifdef IPPROTO_RAW
+       REGISTER_LONG_CONSTANT("STREAM_IPPROTO_RAW", IPPROTO_RAW, 
CONST_CS|CONST_PERSISTENT);
+#endif
 
        REGISTER_LONG_CONSTANT("STREAM_SOCK_STREAM", SOCK_STREAM, 
CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("STREAM_SOCK_DGRAM", SOCK_DGRAM, 
CONST_CS|CONST_PERSISTENT);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php