Skip to content
Browse files

fix build

git-svn-id: http://svn.php.net/repository/pecl/rar/trunk@299933 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
1 parent 9a7227a commit 71fb41635c93b0de92e109a554919951439a416c tony2001 committed May 29, 2010
Showing with 7 additions and 7 deletions.
  1. +1 −1 config.m4
  2. +1 −1 config.w32
  3. +2 −2 rar_navigation.c
  4. +3 −3 rar_stream.c
View
2 config.m4
@@ -26,6 +26,6 @@ if test "$PHP_RAR" != "no"; then
PHP_SUBST(RAR_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(stdc++, "", RAR_SHARED_LIBADD)
- PHP_NEW_EXTENSION(rar, rar.c rar_error.c rararch.c rarentry.c rar_stream.c $unrar_sources, $ext_shared,,-DRARDLL -DGUI -DSILENT -Wno-write-strings -I@ext_srcdir@/unrar)
+ PHP_NEW_EXTENSION(rar, rar.c rar_error.c rararch.c rarentry.c rar_stream.c rar_navigation.c $unrar_sources, $ext_shared,,-DRARDLL -DGUI -DSILENT -Wno-write-strings -I@ext_srcdir@/unrar)
PHP_ADD_BUILD_DIR($ext_builddir/unrar)
fi
View
2 config.w32
@@ -4,7 +4,7 @@
ARG_ENABLE("rar", "Rar support", "no");
if (PHP_RAR != "no") {
- EXTENSION("rar", "rar.c rar_error.c rararch.c rarentry.c rar_stream.c", PHP_RAR_SHARED, "/DRARDLL /DGUI /DSILENT /EHsc /D_WSTDIO_DEFINED");
+ EXTENSION("rar", "rar.c rar_error.c rararch.c rarentry.c rar_stream.c rar_navigation.c", PHP_RAR_SHARED, "/DRARDLL /DGUI /DSILENT /EHsc /D_WSTDIO_DEFINED");
ADD_SOURCES(configure_module_dirname + "/unrar",
"rar.cpp strlist.cpp strfn.cpp \
pathfn.cpp smallfn.cpp savepos.cpp \
View
4 rar_navigation.c
@@ -68,7 +68,7 @@ struct _rar_entries {
/* {{{ Function prototypes for functions with internal linkage */
-static int _rar_nav_list_files(rar_file_t *rar TSRMLS_DC);
+/* static int _rar_nav_list_files(rar_file_t *rar TSRMLS_DC); */
static void _rar_nav_get_depth_and_length(wchar_t *filenamew, const size_t file_size,
int *depth_out, size_t *wlen_out TSRMLS_DC);
static int _rar_nav_get_depth(const wchar_t *filenamew, const size_t file_size);
@@ -351,7 +351,7 @@ int _rar_list_files(rar_file_t *rar TSRMLS_DC) /* {{{ */
packed_size += entry.PackSize;
if (entry.PackSizeHigh != 0) {
#if ULONG_MAX > 0xffffffffUL
- packed_size += ((unsigned long) entry->PackSizeHigh) << 32;
+ packed_size += ((unsigned long) entry.PackSizeHigh) << 32;
#else
packed_size = ULONG_MAX; //cap
#endif
View
6 rar_stream.c
@@ -1047,9 +1047,9 @@ static int _rar_get_cachable_rararch(php_stream_wrapper *wrapper,
}
/* }}} */
-/* {{{ php_stream_tidy_wrapper_error_log */
+/* {{{ php_stream_rar_wrapper_error_log */
/* copied from main/streams/streams.c because it's an internal function */
-void php_stream_tidy_wrapper_error_log(php_stream_wrapper *wrapper TSRMLS_DC)
+void php_stream_rar_wrapper_error_log(php_stream_wrapper *wrapper TSRMLS_DC)
{
if (wrapper) {
/* tidy up the error stack */
@@ -1147,7 +1147,7 @@ static int php_stream_rar_stater(php_stream_wrapper *wrapper,
* if necessary
*/
if (flags & PHP_STREAM_URL_STAT_QUIET)
- php_stream_tidy_wrapper_error_log(wrapper TSRMLS_CC);
+ php_stream_rar_wrapper_error_log(wrapper TSRMLS_CC);
return ret;
}

0 comments on commit 71fb416

Please sign in to comment.
Something went wrong with that request. Please try again.