CVS update: php3/functions

Date: Friday August 14, 1998 @ 11:51 Author: shane Update of /repository/php3/functions In directory asf:/tmp/cvs-serv210 Modified Files: DList.h hg_comm.c hw.c Log Message: Some work on getting hyperwave to work on windows. hg_comm needs a lot of work. Mainly, signals, fnctl, bzero, bcopy, etc are not portable functions. Most of this will have to be rewriten for windows. Index: php3/functions/DList.h diff -c php3/functions/DList.h:1.1 php3/functions/DList.h:1.2 *** php3/functions/DList.h:1.1 Wed Aug 12 05:29:16 1998 --- php3/functions/DList.h Fri Aug 14 11:51:12 1998 *************** *** 4,22 **** * All rights reserved. * * Filename: $RCSfile: DList.h,v $ ! * Version: $Revision: 1.1 $ * * Language: ANSI C * Environment: any * * Description: Header file for doubly linked list routines. * ! * $Id: DList.h,v 1.1 1998/08/12 09:29:16 steinm Exp $ * * Revision History: * ----------------- * * $Log: DList.h,v $ * Revision 1.1 1998/08/12 09:29:16 steinm * First version of Hyperwave module. * --- 4,28 ---- * All rights reserved. * * Filename: $RCSfile: DList.h,v $ ! * Version: $Revision: 1.2 $ * * Language: ANSI C * Environment: any * * Description: Header file for doubly linked list routines. * ! * $Id: DList.h,v 1.2 1998/08/14 15:51:12 shane Exp $ * * Revision History: * ----------------- * * $Log: DList.h,v $ + * Revision 1.2 1998/08/14 15:51:12 shane + * Some work on getting hyperwave to work on windows. hg_comm needs a lot of work. + * + * Mainly, signals, fnctl, bzero, bcopy, etc are not portable functions. Most of this + * will have to be rewriten for windows. + * * Revision 1.1 1998/08/12 09:29:16 steinm * First version of Hyperwave module. * *************** *** 104,110 **** void *dlst_last(DLIST *l); void *dlst_next(void *prev); void *dlst_prev(void *next); ! void dlst_mergesort(DLIST *l,int (*cmp_func)()); #ifdef __cplusplus } --- 110,116 ---- void *dlst_last(DLIST *l); void *dlst_next(void *prev); void *dlst_prev(void *next); ! void dlst_mergesort(DLIST *l,int (*cmp_func)(void*,void*)); #ifdef __cplusplus } Index: php3/functions/hg_comm.c diff -c php3/functions/hg_comm.c:1.1 php3/functions/hg_comm.c:1.2 *** php3/functions/hg_comm.c:1.1 Wed Aug 12 05:29:16 1998 --- php3/functions/hg_comm.c Fri Aug 14 11:51:12 1998 *************** *** 23,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: hg_comm.c,v 1.1 1998/08/12 09:29:16 steinm Exp $ */ //#define HW_DEBUG #include <stdlib.h> ! #ifndef MSVC5 #include "config.h" #endif --- 23,37 ---- +----------------------------------------------------------------------+ */ ! /* $Id: hg_comm.c,v 1.2 1998/08/14 15:51:12 shane Exp $ */ //#define HW_DEBUG #include <stdlib.h> ! #if WIN32|WINNT ! #include "win95nt.h" ! #else #include "config.h" #endif *************** *** 38,49 **** #include <stdio.h> #include <string.h> #include <sys/types.h> ! #include <sys/socket.h> ! #include <netinet/in.h> ! #include <netdb.h> #include <fcntl.h> - #include <unistd.h> - #include <sys/param.h> #include <errno.h> #include <alloc.h> #include "hg_comm.h" --- 40,55 ---- #include <stdio.h> #include <string.h> #include <sys/types.h> ! #if WIN32|WINNT ! # include <winsock.h> ! #else ! # include <sys/socket.h> ! # include <netinet/in.h> ! # include <netdb.h> ! # include <unistd.h> ! # include <sys/param.h> ! #endif #include <fcntl.h> #include <errno.h> #include <alloc.h> #include "hg_comm.h" *************** *** 711,719 **** --- 717,729 ---- * dec@essw.com * *====================================================================*/ + #if WIN32|WINNT + #include <time.h> + #else #include <sys/fcntl.h> #include <sys/time.h> #include <sys/types.h> + #endif #include <errno.h> #include <signal.h> Index: php3/functions/hw.c diff -c php3/functions/hw.c:1.2 php3/functions/hw.c:1.3 *** php3/functions/hw.c:1.2 Wed Aug 12 08:05:33 1998 --- php3/functions/hw.c Fri Aug 14 11:51:12 1998 *************** *** 23,37 **** +----------------------------------------------------------------------+ */ ! /* $Id: hw.c,v 1.2 1998/08/12 12:05:33 steinm Exp $ */ #include <stdlib.h> ! #ifndef MSVC5 #include "config.h" #endif #include "php.h" #include "internal_functions.h" #if HYPERWAVE --- 23,41 ---- +----------------------------------------------------------------------+ */ ! /* $Id: hw.c,v 1.3 1998/08/14 15:51:12 shane Exp $ */ ! #if COMPILE_DL ! #include "dl/phpdl.h" ! #endif #include <stdlib.h> ! #if !(WIN32|WINNT) #include "config.h" #endif #include "php.h" #include "internal_functions.h" + #include "functions/head.h" #if HYPERWAVE *************** *** 121,127 **** void print_msg(hg_msg *msg, char *str, int txt); #if COMPILE_DL ! DLEXPORT php3_module_entry *get_module(void) { return &odbc_module_entry; } #endif void _close_hw_link(hw_connection *conn) --- 125,131 ---- void print_msg(hg_msg *msg, char *str, int txt); #if COMPILE_DL ! DLEXPORT php3_module_entry *get_module(void) { return &hw_module_entry; } #endif void _close_hw_link(hw_connection *conn) *************** *** 1707,1713 **** } void php3_hw_insertdocument(INTERNAL_FUNCTION_PARAMETERS) { ! YYSTYPE *arg1, *arg2, *arg3, *arg4; int link, id, doc, type; hw_connection *ptr; hw_document *docptr; --- 1711,1717 ---- } void php3_hw_insertdocument(INTERNAL_FUNCTION_PARAMETERS) { ! YYSTYPE *arg1, *arg2, *arg3; int link, id, doc, type; hw_connection *ptr; hw_document *docptr; *************** *** 1744,1750 **** } void php3_hw_new_document(INTERNAL_FUNCTION_PARAMETERS) { ! YYSTYPE *arg1, *arg2, *arg3; hw_document *doc; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { --- 1748,1754 ---- } void php3_hw_new_document(INTERNAL_FUNCTION_PARAMETERS) { ! YYSTYPE *arg1, *arg2; hw_document *doc; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { -- 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