CVS update: php31/main
| From: | zeev | Date: | Tue, 22 Sep 1998 12:22:37 +0000 |
| Subject: | CVS update: php31/main | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1366@lists.php.net to get a copy of this message | ||
Date: Tuesday September 22, 1998 @ 8:22
Author: zeev
Update of /repository/php31/main
In directory asf:/u2/tmp/cvs-serv10963/main
Modified Files:
Makefile.am mkextinfo php3_hash.c php3_hash.h
Log Message:
Fixed missing 64-bit patches
Fixed vpath support to work after Stig's dependencies fixes
Index: php31/main/Makefile.am
diff -c php31/main/Makefile.am:2.10 php31/main/Makefile.am:2.11
*** php31/main/Makefile.am:2.10 Tue Sep 15 09:02:13 1998
--- php31/main/Makefile.am Tue Sep 22 08:22:35 1998
***************
*** 66,72 ****
internal_functions.c: extinfo.c exthdrs.h
extinfo.c: Makefile mkextinfo @EXTINFO_DEPS@
! ./mkextinfo $(EXTENSIONS) > $@.temp
@if ! cmp $@ $@.tmp >/dev/null 2>&1; then \
mv $@.temp $@ ; \
else \
--- 66,72 ----
internal_functions.c: extinfo.c exthdrs.h
extinfo.c: Makefile mkextinfo @EXTINFO_DEPS@
! $(srcdir)/mkextinfo $(EXTENSIONS) > $@.temp
@if ! cmp $@ $@.tmp >/dev/null 2>&1; then \
mv $@.temp $@ ; \
else \
***************
*** 74,80 ****
fi
exthdrs.h: Makefile mkexthdrs
! ./mkexthdrs $(EXTENSIONS) > $@.temp
@if ! cmp $@ $@.tmp >/dev/null 2>&1; then \
mv $@.temp $@ ; \
else \
--- 74,80 ----
fi
exthdrs.h: Makefile mkexthdrs
! srcdir=$(srcdir) ; $(srcdir)/mkexthdrs $(EXTENSIONS) > $@.temp
@if ! cmp $@ $@.tmp >/dev/null 2>&1; then \
mv $@.temp $@ ; \
else \
Index: php31/main/mkextinfo
diff -c php31/main/mkextinfo:2.1 php31/main/mkextinfo:2.2
*** php31/main/mkextinfo:2.1 Tue Sep 15 09:02:15 1998
--- php31/main/mkextinfo Tue Sep 22 08:22:36 1998
***************
*** 8,14 ****
for ext in $@; do
# echo " { \"$ext\", ${ext}_module_ptr },"
! cat ../ext/$ext/extinfo.c.stub
done
echo " {NULL, NULL}"
--- 8,14 ----
for ext in $@; do
# echo " { \"$ext\", ${ext}_module_ptr },"
! cat $srcdir/../ext/$ext/extinfo.c.stub
done
echo " {NULL, NULL}"
Index: php31/main/php3_hash.c
diff -c php31/main/php3_hash.c:2.3 php31/main/php3_hash.c:2.4
*** php31/main/php3_hash.c:2.3 Mon Sep 21 07:23:05 1998
--- php31/main/php3_hash.c Tue Sep 22 08:22:36 1998
***************
*** 29,35 ****
*/
! /* $Id: php3_hash.c,v 2.3 1998/09/21 11:23:05 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 29,35 ----
*/
! /* $Id: php3_hash.c,v 2.4 1998/09/22 12:22:36 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 940,946 ****
}
! PHPAPI int _php3_hash_get_current_key(HashTable *ht, char **str_index, int *int_index)
{
Bucket *p = ht->pInternalPointer;
--- 940,946 ----
}
! PHPAPI int _php3_hash_get_current_key(HashTable *ht, char **str_index, ulong *num_index)
{
Bucket *p = ht->pInternalPointer;
***************
*** 951,957 ****
memcpy(*str_index, p->arKey, p->nKeyLength);
return HASH_KEY_IS_STRING;
} else {
! *int_index = p->h;
return HASH_KEY_IS_INT;
}
}
--- 951,957 ----
memcpy(*str_index, p->arKey, p->nKeyLength);
return HASH_KEY_IS_STRING;
} else {
! *num_index = p->h;
return HASH_KEY_IS_INT;
}
}
Index: php31/main/php3_hash.h
diff -c php31/main/php3_hash.h:2.1 php31/main/php3_hash.h:2.2
*** php31/main/php3_hash.h:2.1 Mon Sep 21 07:23:06 1998
--- php31/main/php3_hash.h Tue Sep 22 08:22:37 1998
***************
*** 29,35 ****
*/
! /* $Id: php3_hash.h,v 2.1 1998/09/21 11:23:06 zeev Exp $ */
#ifndef _HASH_
--- 29,35 ----
*/
! /* $Id: php3_hash.h,v 2.2 1998/09/22 12:22:37 zeev Exp $ */
#ifndef _HASH_
***************
*** 126,132 ****
/* traversing */
extern PHPAPI void _php3_hash_move_forward(HashTable *ht);
extern PHPAPI void _php3_hash_move_backwards(HashTable *ht);
! extern PHPAPI int _php3_hash_get_current_key(HashTable *ht, char **str_index, int *int_index);
extern PHPAPI int _php3_hash_get_current_data(HashTable *ht, void **pData);
extern PHPAPI void _php3_hash_internal_pointer_reset(HashTable *ht);
extern PHPAPI void _php3_hash_internal_pointer_end(HashTable *ht);
--- 126,132 ----
/* traversing */
extern PHPAPI void _php3_hash_move_forward(HashTable *ht);
extern PHPAPI void _php3_hash_move_backwards(HashTable *ht);
! extern PHPAPI int _php3_hash_get_current_key(HashTable *ht, char **str_index, ulong *num_index);
extern PHPAPI int _php3_hash_get_current_data(HashTable *ht, void **pData);
extern PHPAPI void _php3_hash_internal_pointer_reset(HashTable *ht);
extern PHPAPI void _php3_hash_internal_pointer_end(HashTable *ht);
--
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