sniper Wed Jul 13 20:12:27 2005 EDT
Modified files:
/php-src configure.in acinclude.m4
/php-src/main php_network.h
Log:
- Fixed cacheing bug in PHP_SOCKADDR_SA_LEN macro
- Removed duplicate sa_len check from configure.in
- Unified the sockaddr tests into PHP_SOCKADDR_CHECKS macro
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.572&r2=1.573&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.572 php-src/configure.in:1.573
--- php-src/configure.in:1.572 Tue Jul 12 16:25:27 2005
+++ php-src/configure.in Wed Jul 13 20:12:20 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.572 2005/07/12 20:25:27 andi Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.573 2005/07/14 00:12:20 sniper Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -442,24 +442,8 @@
AC_TYPE_SIZE_T
AC_TYPE_UID_T
-dnl Check for struct sockaddr_storage
-AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_sockaddr_storage,
-[AC_TRY_COMPILE([ #include <sys/types.h>
-#include <sys/socket.h>], [struct sockaddr_storage s; s],
- ac_cv_sockaddr_storage=yes, ac_cv_sockaddr_storage=no)])
-if test "$ac_cv_sockaddr_storage" = yes; then
- AC_DEFINE(HAVE_SOCKADDR_STORAGE,1,[Whether you have struct sockaddr_storage])
-fi
-
-dnl Check if sockaddr data structure includes an "sa_len" member
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-], [
- static struct sockaddr sa; int n = (int) sa.sa_len; return n
-], [
- AC_DEFINE(HAVE_SOCKADDR_LEN,1,[Whether sockaddr struct has sa_len])
-], [])
+dnl Checks for sockaddr_storage and sockaddr.sa_len
+PHP_SOCKADDR_CHECKS
dnl Check for IPv6 support
AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support,
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.330&r2=1.331&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.330 php-src/acinclude.m4:1.331
--- php-src/acinclude.m4:1.330 Wed Jul 13 20:08:13 2005
+++ php-src/acinclude.m4 Wed Jul 13 20:12:22 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.330 2005/07/14 00:08:13 sniper Exp $
+dnl $Id: acinclude.m4,v 1.331 2005/07/14 00:12:22 sniper Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -1482,17 +1482,29 @@
])
dnl
-dnl PHP_SOCKADDR_SA_LEN
+dnl PHP_SOCKADDR_CHECKS
dnl
-AC_DEFUN([PHP_SOCKADDR_SA_LEN],[
+AC_DEFUN([PHP_SOCKADDR_CHECKS], [
+ dnl Check for struct sockaddr_storage exists
+ AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_sockaddr_storage,
+ [AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/socket.h>],
+ [struct sockaddr_storage s; s],
+ [ac_cv_sockaddr_storage=yes], [ac_cv_sockaddr_storage=no])
+ ])
+ if test "$ac_cv_sockaddr_storage" = "yes"; then
+ AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [Whether you have struct
sockaddr_storage])
+ fi
+ dnl Check if field sa_len exists in struct sockaddr
AC_CACHE_CHECK([for field sa_len in struct sockaddr],ac_cv_sockaddr_sa_len,[
AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/socket.h>],
- [struct sockaddr s; s.sa_len;],
- [ac_cv_sockaddr_sa_len=yes
- AC_DEFINE(HAVE_SOCKADDR_SA_LEN,1,[ ])],
- [ac_cv_sockaddr_sa_len=no])
+ [static struct sockaddr sa; int n = (int) sa.sa_len; return n;],
+ [ac_cv_sockaddr_sa_len=yes], [ac_cv_sockaddr_sa_len=no])
])
+ if test "$ac_cv_sockaddr_sa_len" = "yes"; then
+ AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Whether struct sockaddr has field
sa_len])
+ fi
])
dnl
http://cvs.php.net/diff.php/php-src/main/php_network.h?r1=1.54&r2=1.55&ty=u
Index: php-src/main/php_network.h
diff -u php-src/main/php_network.h:1.54 php-src/main/php_network.h:1.55
--- php-src/main/php_network.h:1.54 Mon Jun 13 22:39:42 2005
+++ php-src/main/php_network.h Wed Jul 13 20:12:26 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_network.h,v 1.54 2005/06/14 02:39:42 iliaa Exp $ */
+/* $Id: php_network.h,v 1.55 2005/07/14 00:12:26 sniper Exp $ */
#ifndef _PHP_NETWORK_H
#define _PHP_NETWORK_H
@@ -210,7 +210,7 @@
typedef struct sockaddr_storage php_sockaddr_storage;
#else
typedef struct {
-#ifdef HAVE_SOCKADDR_LEN
+#ifdef HAVE_SOCKADDR_SA_LEN
unsigned char ss_len;
unsigned char ss_family;
#else
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
