CVS update: php3/functions
| From: | shane | Date: | Sat, 17 Oct 1998 19:32:57 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1868@lists.php.net to get a copy of this message | ||
Date: Saturday October 17, 1998 @ 15:32
Author: shane
Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv22110/functions
Modified Files:
dns.c oracle.c
Log Message:
Get rid of some anoying compiler warnings. is typedefing ntohs in dns.c
ok on other platforms?
Index: php3/functions/dns.c
diff -c php3/functions/dns.c:1.48 php3/functions/dns.c:1.49
*** php3/functions/dns.c:1.48 Tue Oct 6 05:44:18 1998
--- php3/functions/dns.c Sat Oct 17 15:32:55 1998
***************
*** 28,34 ****
+----------------------------------------------------------------------+
*/
! /* $Id: dns.c,v 1.48 1998/10/06 09:44:18 martin Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 28,34 ----
+----------------------------------------------------------------------+
*/
! /* $Id: dns.c,v 1.49 1998/10/17 19:32:55 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 38,44 ****
#include <sys/socket.h>
#endif
#if WIN32|WINNT
- #include <winsock.h>
#if HAVE_BINDLIB
#ifndef WINNT
#define WINNT 1
--- 38,43 ----
***************
*** 49,54 ****
--- 48,54 ----
#include "arpa/nameser.h"
#include "resolv.h"
#endif
+ #include <winsock.h>
#else
#include <netinet/in.h>
#include <arpa/inet.h>
***************
*** 288,299 ****
hp = (HEADER *)&ans;
cp = (u_char *)&ans + HFIXEDSZ;
end = (u_char *)&ans +i;
! for ( qdc = ntohs(hp->qdcount); qdc--; cp += i + QFIXEDSZ) {
if ( (i = dn_skipname(cp,end)) < 0 ) {
RETURN_FALSE;
}
}
! count = ntohs(hp->ancount);
while ( --count >= 0 && cp < end ) {
if ( (i = dn_skipname(cp,end)) < 0 ) {
RETURN_FALSE;
--- 288,299 ----
hp = (HEADER *)&ans;
cp = (u_char *)&ans + HFIXEDSZ;
end = (u_char *)&ans +i;
! for ( qdc = ntohs((unsigned short)hp->qdcount); qdc--; cp += i + QFIXEDSZ) {
if ( (i = dn_skipname(cp,end)) < 0 ) {
RETURN_FALSE;
}
}
! count = ntohs((unsigned short)hp->ancount);
while ( --count >= 0 && cp < end ) {
if ( (i = dn_skipname(cp,end)) < 0 ) {
RETURN_FALSE;
Index: php3/functions/oracle.c
diff -c php3/functions/oracle.c:1.82 php3/functions/oracle.c:1.83
*** php3/functions/oracle.c:1.82 Mon Oct 5 10:46:48 1998
--- php3/functions/oracle.c Sat Oct 17 15:32:56 1998
***************
*** 161,167 ****
};
#if COMPILE_DL
! php3_module_entry *get_module() { return &oracle_module_entry; };
#if (WIN32|WINNT) && defined(THREAD_SAFE)
/* NOTE: You should have an oracle.def file where you export DllMain */
--- 161,167 ----
};
#if COMPILE_DL
! DLEXPORT php3_module_entry *get_module() { return &oracle_module_entry; };
#if (WIN32|WINNT) && defined(THREAD_SAFE)
/* NOTE: You should have an oracle.def file where you export DllMain */
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net