Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fix build

git-svn-id: http://svn.php.net/repository/pecl/rar/trunk@299933 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
commit 71fb41635c93b0de92e109a554919951439a416c 1 parent 9a7227a
tony2001 authored
2  config.m4
@@ -26,6 +26,6 @@ if test "$PHP_RAR" != "no"; then
26 26 PHP_SUBST(RAR_SHARED_LIBADD)
27 27 PHP_ADD_LIBRARY_WITH_PATH(stdc++, "", RAR_SHARED_LIBADD)
28 28
29   - 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)
  29 + 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)
30 30 PHP_ADD_BUILD_DIR($ext_builddir/unrar)
31 31 fi
2  config.w32
@@ -4,7 +4,7 @@
4 4 ARG_ENABLE("rar", "Rar support", "no");
5 5
6 6 if (PHP_RAR != "no") {
7   - EXTENSION("rar", "rar.c rar_error.c rararch.c rarentry.c rar_stream.c", PHP_RAR_SHARED, "/DRARDLL /DGUI /DSILENT /EHsc /D_WSTDIO_DEFINED");
  7 + 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");
8 8 ADD_SOURCES(configure_module_dirname + "/unrar",
9 9 "rar.cpp strlist.cpp strfn.cpp \
10 10 pathfn.cpp smallfn.cpp savepos.cpp \
4 rar_navigation.c
@@ -68,7 +68,7 @@ struct _rar_entries {
68 68
69 69
70 70 /* {{{ Function prototypes for functions with internal linkage */
71   -static int _rar_nav_list_files(rar_file_t *rar TSRMLS_DC);
  71 +/* static int _rar_nav_list_files(rar_file_t *rar TSRMLS_DC); */
72 72 static void _rar_nav_get_depth_and_length(wchar_t *filenamew, const size_t file_size,
73 73 int *depth_out, size_t *wlen_out TSRMLS_DC);
74 74 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) /* {{{ */
351 351 packed_size += entry.PackSize;
352 352 if (entry.PackSizeHigh != 0) {
353 353 #if ULONG_MAX > 0xffffffffUL
354   - packed_size += ((unsigned long) entry->PackSizeHigh) << 32;
  354 + packed_size += ((unsigned long) entry.PackSizeHigh) << 32;
355 355 #else
356 356 packed_size = ULONG_MAX; //cap
357 357 #endif
6 rar_stream.c
@@ -1047,9 +1047,9 @@ static int _rar_get_cachable_rararch(php_stream_wrapper *wrapper,
1047 1047 }
1048 1048 /* }}} */
1049 1049
1050   -/* {{{ php_stream_tidy_wrapper_error_log */
  1050 +/* {{{ php_stream_rar_wrapper_error_log */
1051 1051 /* copied from main/streams/streams.c because it's an internal function */
1052   -void php_stream_tidy_wrapper_error_log(php_stream_wrapper *wrapper TSRMLS_DC)
  1052 +void php_stream_rar_wrapper_error_log(php_stream_wrapper *wrapper TSRMLS_DC)
1053 1053 {
1054 1054 if (wrapper) {
1055 1055 /* tidy up the error stack */
@@ -1147,7 +1147,7 @@ static int php_stream_rar_stater(php_stream_wrapper *wrapper,
1147 1147 * if necessary
1148 1148 */
1149 1149 if (flags & PHP_STREAM_URL_STAT_QUIET)
1150   - php_stream_tidy_wrapper_error_log(wrapper TSRMLS_CC);
  1150 + php_stream_rar_wrapper_error_log(wrapper TSRMLS_CC);
1151 1151
1152 1152 return ret;
1153 1153 }

0 comments on commit 71fb416

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