CVS update: php31/ext/sybase-ct
| From: | zeev | Date: | Thu, 20 Aug 1998 21:50:30 +0000 |
| Subject: | CVS update: php31/ext/sybase-ct | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-364@lists.php.net to get a copy of this message | ||
Date: Thursday August 20, 1998 @ 17:50
Author: zeev
Update of /repository/php31/ext/sybase-ct
In directory asf:/tmp/cvs-serv16450/ext/sybase-ct
Modified Files:
Makefile.am configure.in.stub sybase-ct.c
Log Message:
Plenty of fixes, mostly to virtual source dir support (works fine now)
Several fixes to modules
Index: php31/ext/sybase-ct/Makefile.am
diff -c php31/ext/sybase-ct/Makefile.am:1.2 php31/ext/sybase-ct/Makefile.am:1.3
*** php31/ext/sybase-ct/Makefile.am:1.2 Fri Jul 17 13:45:25 1998
--- php31/ext/sybase-ct/Makefile.am Thu Aug 20 17:50:29 1998
***************
*** 1,4 ****
## Process this file with automake to produce Makefile.in
! INCLUDES=@INCLUDES@ -I../../main -I../standard
noinst_LIBRARIES=libphpext_sybase-ct.a
libphpext_sybase_ct_a_SOURCES=sybase-ct.c
--- 1,4 ----
## Process this file with automake to produce Makefile.in
! INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/main -I@top_srcdir@/ext/standard
noinst_LIBRARIES=libphpext_sybase-ct.a
libphpext_sybase_ct_a_SOURCES=sybase-ct.c
Index: php31/ext/sybase-ct/configure.in.stub
diff -c php31/ext/sybase-ct/configure.in.stub:1.2 php31/ext/sybase-ct/configure.in.stub:1.3
*** php31/ext/sybase-ct/configure.in.stub:1.2 Fri Jul 17 13:45:26 1998
--- php31/ext/sybase-ct/configure.in.stub Thu Aug 20 17:50:29 1998
***************
*** 1,5 ****
! dnl $Id: configure.in.stub,v 1.2 1998/07/17 17:45:26 ssb Exp $ -*- sh -*-
AC_MSG_CHECKING(for Sybase-CT support)
AC_ARG_WITH(sybase-ct,
[ --with-sybase-ct[=DIR] Include Sybase-CT support. DIR is the Sybase home
--- 1,8 ----
! dnl $Id: configure.in.stub,v 1.3 1998/08/20 21:50:29 zeev Exp $ -*- sh -*-
+ dnl The linking info is added before the rest of the info intentionally.
+ dnl The converted a.out libraries cause ld to segfault otherwise.
+
AC_MSG_CHECKING(for Sybase-CT support)
AC_ARG_WITH(sybase-ct,
[ --with-sybase-ct[=DIR] Include Sybase-CT support. DIR is the Sybase home
***************
*** 15,21 ****
fi
AC_MSG_RESULT(yes)
INCLUDES="$INCLUDES -I$SYBASE_CT_INCDIR"
! LDADD="$LDADD -L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl -lsybtcl -linsck"
EXT_SUBDIRS="$EXT_SUBDIRS sybase-ct"
AC_DEFINE(HAVE_SYBASE_CT)
else
--- 18,24 ----
fi
AC_MSG_RESULT(yes)
INCLUDES="$INCLUDES -I$SYBASE_CT_INCDIR"
! LDADD="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl -lsybtcl -linsck $LDADD"
EXT_SUBDIRS="$EXT_SUBDIRS sybase-ct"
AC_DEFINE(HAVE_SYBASE_CT)
else
Index: php31/ext/sybase-ct/sybase-ct.c
diff -c php31/ext/sybase-ct/sybase-ct.c:1.1 php31/ext/sybase-ct/sybase-ct.c:1.2
*** php31/ext/sybase-ct/sybase-ct.c:1.1 Fri Jul 3 12:24:47 1998
--- php31/ext/sybase-ct/sybase-ct.c Thu Aug 20 17:50:30 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: sybase-ct.c,v 1.1 1998/07/03 16:24:47 ssb Exp $ */
#ifndef MSVC5
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: sybase-ct.c,v 1.2 1998/08/20 21:50:30 zeev Exp $ */
#ifndef MSVC5
***************
*** 1014,1020 ****
for (i=0; i<result->num_fields; i++) {
tmp = result->data[result->cur_row][i];
yystype_copy_constructor(&tmp);
! if (php3_ini.magic_quotes_runtime && tmp.type == IS_STRING) {
tmp.value.str.val =
_php3_addslashes(tmp.value.str.val,tmp.value.str.len,&tmp.value.str.len,1);
}
_php3_hash_index_update(return_value->value.ht, i, (void *) &tmp, sizeof(pval), (void **)
&yystype_ptr);
--- 1014,1020 ----
for (i=0; i<result->num_fields; i++) {
tmp = result->data[result->cur_row][i];
yystype_copy_constructor(&tmp);
! if (php3_ini_master.magic_quotes_runtime && tmp.type == IS_STRING) {
tmp.value.str.val =
_php3_addslashes(tmp.value.str.val,tmp.value.str.len,&tmp.value.str.len,1);
}
_php3_hash_index_update(return_value->value.ht, i, (void *) &tmp, sizeof(pval), (void **)
&yystype_ptr);
--
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