[Python-checkins] python/dist/src/Modules addrinfo.h,1.5,1.6

bcannon at users.sourceforge.net bcannon at users.sourceforge.net
Sat Jul 10 21:30:43 CEST 2004


Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17021/Modules

Modified Files:
	addrinfo.h 
Log Message:
Add comments at end of every #endif and fix ones already there when for closing
off #ifndef's.


Index: addrinfo.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/addrinfo.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** addrinfo.h	29 Mar 2003 10:04:54 -0000	1.5
--- addrinfo.h	10 Jul 2004 19:30:39 -0000	1.6
***************
*** 54,58 ****
  #undef getaddrinfo
  #define getaddrinfo fake_getaddrinfo
! #endif
  
  #define	EAI_ADDRFAMILY	 1	/* address family for hostname not supported */
--- 54,58 ----
  #undef getaddrinfo
  #define getaddrinfo fake_getaddrinfo
! #endif /* EAI_ADDRFAMILY */
  
  #define	EAI_ADDRFAMILY	 1	/* address family for hostname not supported */
***************
*** 84,88 ****
  #undef AI_V4MAPPED
  #undef AI_DEFAULT
! #endif
  
  #define	AI_PASSIVE	0x00000001 /* get address to use bind() */
--- 84,88 ----
  #undef AI_V4MAPPED
  #undef AI_DEFAULT
! #endif /* AI_PASSIVE */
  
  #define	AI_PASSIVE	0x00000001 /* get address to use bind() */
***************
*** 99,103 ****
  #define	AI_DEFAULT	(AI_V4MAPPED_CFG | AI_ADDRCONFIG)
  
! #endif /* HAVE_GETADDRINFO */
  
  #ifndef HAVE_GETNAMEINFO
--- 99,103 ----
  #define	AI_DEFAULT	(AI_V4MAPPED_CFG | AI_ADDRCONFIG)
  
! #endif /* !HAVE_GETADDRINFO */
  
  #ifndef HAVE_GETNAMEINFO
***************
*** 109,113 ****
  #define	NI_MAXHOST	1025
  #define	NI_MAXSERV	32
! #endif
  
  /*
--- 109,113 ----
  #define	NI_MAXHOST	1025
  #define	NI_MAXSERV	32
! #endif /* !NI_MAXHOST */
  
  /*
***************
*** 120,126 ****
  #define	NI_NUMERICSERV	0x00000008
  #define	NI_DGRAM	0x00000010
! #endif
  
! #endif /* HAVE_GETNAMEINFO */
  
  #ifndef HAVE_ADDRINFO
--- 120,126 ----
  #define	NI_NUMERICSERV	0x00000008
  #define	NI_DGRAM	0x00000010
! #endif /* !NI_NOFQDN */
  
! #endif /* !HAVE_GETNAMEINFO */
  
  #ifndef HAVE_ADDRINFO
***************
*** 135,139 ****
  	struct addrinfo *ai_next;	/* next structure in linked list */
  };
! #endif
  
  #ifndef HAVE_SOCKADDR_STORAGE
--- 135,139 ----
  	struct addrinfo *ai_next;	/* next structure in linked list */
  };
! #endif /* !HAVE_ADDRINFO */
  
  #ifndef HAVE_SOCKADDR_STORAGE
***************
*** 146,150 ****
  #else
  #define _SS_ALIGNSIZE	(sizeof(double))
! #endif
  #define _SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(u_char) * 2)
  #define _SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(u_char) * 2 - \
--- 146,150 ----
  #else
  #define _SS_ALIGNSIZE	(sizeof(double))
! #endif /* HAVE_LONG_LONG */
  #define _SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(u_char) * 2)
  #define _SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(u_char) * 2 - \
***************
*** 157,161 ****
  #else
  	unsigned short ss_family;	/* address family */
! #endif
  	char	__ss_pad1[_SS_PAD1SIZE];
  #ifdef HAVE_LONG_LONG
--- 157,161 ----
  #else
  	unsigned short ss_family;	/* address family */
! #endif /* HAVE_SOCKADDR_SA_LEN */
  	char	__ss_pad1[_SS_PAD1SIZE];
  #ifdef HAVE_LONG_LONG
***************
*** 163,170 ****
  #else
  	double __ss_align;	/* force desired structure storage alignment */
! #endif
  	char	__ss_pad2[_SS_PAD2SIZE];
  };
! #endif
  
  #ifdef __cplusplus
--- 163,170 ----
  #else
  	double __ss_align;	/* force desired structure storage alignment */
! #endif /* HAVE_LONG_LONG */
  	char	__ss_pad2[_SS_PAD2SIZE];
  };
! #endif /* !HAVE_SOCKADDR_STORAGE */
  
  #ifdef __cplusplus



More information about the Python-checkins mailing list