~ubuntu-branches/ubuntu/trusty/nginx/trusty-proposed

« back to all changes in this revision

Viewing changes to auto/lib/pcre/patch.pcre.c

Committer: Package Import Robot
Author(s): Kartik Mistry
Date: 2013-04-25 12:51:45 UTC
mfrom: (1.3.28)
mto: (1.3.29) (15.1.2 experimental)
mto: This revision was merged to the branch mainline in revision 64.
Revision ID: package-import@ubuntu.com-20130425125145-ugl0wor6bq0u5eae

Tags: upstream-1.4.0

Import upstream version 1.4.0

files added:
auto/cc/clang

auto/endianness

auto/lib/geoip

auto/lib/geoip/conf

auto/lib/libatomic

auto/lib/libatomic/conf

auto/lib/libatomic/make

auto/lib/libgd

auto/lib/libgd/conf

auto/lib/libxslt

auto/lib/libxslt/conf

auto/lib/openssl/makefile.bcc

auto/lib/openssl/makefile.msvc

auto/os/darwin

conf/fastcgi.conf

conf/scgi_params

conf/uwsgi_params

man/nginx.8

src/core/ngx_crypt.c

src/core/ngx_crypt.h

src/core/ngx_md5.c

src/core/ngx_murmurhash.c

src/core/ngx_murmurhash.h

src/core/ngx_queue.c

src/event/modules/ngx_win32_select_module.c

src/event/ngx_event_openssl_stapling.c

src/http/modules/ngx_http_degradation_module.c

src/http/modules/ngx_http_geoip_module.c

src/http/modules/ngx_http_gunzip_filter_module.c

src/http/modules/ngx_http_image_filter_module.c

src/http/modules/ngx_http_limit_conn_module.c

src/http/modules/ngx_http_limit_req_module.c

src/http/modules/ngx_http_mp4_module.c

src/http/modules/ngx_http_random_index_module.c

src/http/modules/ngx_http_scgi_module.c

src/http/modules/ngx_http_secure_link_module.c

src/http/modules/ngx_http_split_clients_module.c

src/http/modules/ngx_http_upstream_keepalive_module.c

src/http/modules/ngx_http_upstream_least_conn_module.c

src/http/modules/ngx_http_uwsgi_module.c

src/http/modules/ngx_http_xslt_filter_module.c

src/http/ngx_http_spdy.c

src/http/ngx_http_spdy.h

src/http/ngx_http_spdy_filter_module.c

src/http/ngx_http_spdy_module.c

src/http/ngx_http_spdy_module.h

src/misc/ngx_cpp_test_module.cpp

src/os/unix/ngx_darwin.h

src/os/unix/ngx_darwin_config.h

src/os/unix/ngx_darwin_init.c

src/os/unix/ngx_darwin_sendfile_chain.c

src/os/unix/ngx_file_aio_read.c

src/os/unix/ngx_linux_aio_read.c

src/os/unix/ngx_setaffinity.c

src/os/unix/ngx_setaffinity.h

files removed:
auto/endianess

auto/lib/pcre/patch.config.in

auto/lib/pcre/patch.pcre.c

auto/lib/pcre/patch.pcre.in

auto/lib/pcre/patch.pcre.in.owc

auto/os/features

auto/threads

src/core/ngx_garbage_collector.c

src/core/ngx_garbage_collector.h

src/event/modules/ngx_kqueue_module.h

src/http/modules/ngx_http_limit_zone_module.c

src/http/ngx_http_cache.c

src/os/unix/ngx_aio.h

src/os/unix/ngx_sunpro_x86.map

src/os/unix/ngx_types.h

files modified:
CHANGES

CHANGES.ru

LICENSE

README

auto/cc/acc

auto/cc/bcc

auto/cc/ccc

auto/cc/conf

auto/cc/gcc

auto/cc/icc

auto/cc/msvc

auto/cc/name

auto/cc/owc

auto/cc/sunc

auto/define

auto/feature

auto/have

auto/have_headers

auto/headers

auto/include

auto/init

auto/install

auto/lib/conf

auto/lib/google-perftools/conf

auto/lib/make

auto/lib/md5/conf

auto/lib/md5/make

auto/lib/md5/makefile.bcc

auto/lib/md5/makefile.msvc

auto/lib/md5/makefile.owc

auto/lib/openssl/conf

auto/lib/openssl/make

auto/lib/pcre/conf

auto/lib/pcre/make

auto/lib/pcre/makefile.bcc

auto/lib/pcre/makefile.msvc

auto/lib/pcre/makefile.owc

auto/lib/perl/conf

auto/lib/perl/make

auto/lib/sha1/conf

auto/lib/sha1/make

auto/lib/sha1/makefile.bcc

auto/lib/sha1/makefile.msvc

auto/lib/sha1/makefile.owc

auto/lib/test

auto/lib/zlib/conf

auto/lib/zlib/make

auto/lib/zlib/makefile.bcc

auto/lib/zlib/makefile.msvc

auto/lib/zlib/makefile.owc

auto/make

auto/modules

auto/nohave

auto/options

auto/os/conf

auto/os/freebsd

auto/os/linux

auto/os/solaris

auto/os/win32

auto/sources

auto/stubs

auto/summary

auto/types/sizeof

auto/types/typedef

auto/types/uintptr_t

auto/types/value

auto/unix

conf/fastcgi_params

conf/mime.types

conf/nginx.conf

configure

html/50x.html

html/index.html

src/core/nginx.c

src/core/nginx.h

src/core/ngx_array.c

src/core/ngx_array.h

src/core/ngx_buf.c

src/core/ngx_buf.h

src/core/ngx_conf_file.c

src/core/ngx_conf_file.h

src/core/ngx_config.h

src/core/ngx_connection.c

src/core/ngx_connection.h

src/core/ngx_core.h

src/core/ngx_cpuinfo.c

src/core/ngx_crc.h

src/core/ngx_crc32.c

src/core/ngx_crc32.h

src/core/ngx_cycle.c

src/core/ngx_cycle.h

src/core/ngx_file.c

src/core/ngx_file.h

src/core/ngx_hash.c

src/core/ngx_hash.h

src/core/ngx_inet.c

src/core/ngx_inet.h

src/core/ngx_list.c

src/core/ngx_list.h

src/core/ngx_log.c

src/core/ngx_log.h

src/core/ngx_md5.h

src/core/ngx_open_file_cache.c

src/core/ngx_open_file_cache.h

src/core/ngx_output_chain.c

src/core/ngx_palloc.c

src/core/ngx_palloc.h

src/core/ngx_parse.c

src/core/ngx_parse.h

src/core/ngx_queue.h

src/core/ngx_radix_tree.c

src/core/ngx_radix_tree.h

src/core/ngx_rbtree.c

src/core/ngx_rbtree.h

src/core/ngx_regex.c

src/core/ngx_regex.h

src/core/ngx_resolver.c

src/core/ngx_resolver.h

src/core/ngx_sha1.h

src/core/ngx_shmtx.c

src/core/ngx_shmtx.h

src/core/ngx_slab.c

src/core/ngx_slab.h

src/core/ngx_spinlock.c

src/core/ngx_string.c

src/core/ngx_string.h

src/core/ngx_times.c

src/core/ngx_times.h

src/event/modules/ngx_aio_module.c

src/event/modules/ngx_devpoll_module.c

src/event/modules/ngx_epoll_module.c

src/event/modules/ngx_eventport_module.c

src/event/modules/ngx_kqueue_module.c

src/event/modules/ngx_poll_module.c

src/event/modules/ngx_rtsig_module.c

src/event/modules/ngx_select_module.c

src/event/ngx_event.c

src/event/ngx_event.h

src/event/ngx_event_accept.c

src/event/ngx_event_busy_lock.c

src/event/ngx_event_busy_lock.h

src/event/ngx_event_connect.c

src/event/ngx_event_connect.h

src/event/ngx_event_mutex.c

src/event/ngx_event_openssl.c

src/event/ngx_event_openssl.h

src/event/ngx_event_pipe.c

src/event/ngx_event_pipe.h

src/event/ngx_event_posted.c

src/event/ngx_event_posted.h

src/event/ngx_event_timer.c

src/event/ngx_event_timer.h

src/http/modules/ngx_http_access_module.c

src/http/modules/ngx_http_addition_filter_module.c

src/http/modules/ngx_http_auth_basic_module.c

src/http/modules/ngx_http_autoindex_module.c

src/http/modules/ngx_http_browser_module.c

src/http/modules/ngx_http_charset_filter_module.c

src/http/modules/ngx_http_chunked_filter_module.c

src/http/modules/ngx_http_dav_module.c

src/http/modules/ngx_http_empty_gif_module.c

src/http/modules/ngx_http_fastcgi_module.c

src/http/modules/ngx_http_flv_module.c

src/http/modules/ngx_http_geo_module.c

src/http/modules/ngx_http_gzip_filter_module.c

src/http/modules/ngx_http_gzip_static_module.c

src/http/modules/ngx_http_headers_filter_module.c

src/http/modules/ngx_http_index_module.c

src/http/modules/ngx_http_log_module.c

src/http/modules/ngx_http_map_module.c

src/http/modules/ngx_http_memcached_module.c

src/http/modules/ngx_http_not_modified_filter_module.c

src/http/modules/ngx_http_proxy_module.c

src/http/modules/ngx_http_range_filter_module.c

src/http/modules/ngx_http_realip_module.c

src/http/modules/ngx_http_referer_module.c

src/http/modules/ngx_http_rewrite_module.c

src/http/modules/ngx_http_ssi_filter_module.c

src/http/modules/ngx_http_ssi_filter_module.h

src/http/modules/ngx_http_ssl_module.c

src/http/modules/ngx_http_ssl_module.h

src/http/modules/ngx_http_static_module.c

src/http/modules/ngx_http_stub_status_module.c

src/http/modules/ngx_http_sub_filter_module.c

src/http/modules/ngx_http_upstream_ip_hash_module.c

src/http/modules/ngx_http_userid_filter_module.c

src/http/modules/perl/Makefile.PL

src/http/modules/perl/nginx.pm

src/http/modules/perl/nginx.xs

src/http/modules/perl/ngx_http_perl_module.c

src/http/modules/perl/ngx_http_perl_module.h

src/http/ngx_http.c

src/http/ngx_http.h

src/http/ngx_http_busy_lock.c

src/http/ngx_http_busy_lock.h

src/http/ngx_http_cache.h

src/http/ngx_http_config.h

src/http/ngx_http_copy_filter_module.c

src/http/ngx_http_core_module.c

src/http/ngx_http_core_module.h

src/http/ngx_http_file_cache.c

src/http/ngx_http_header_filter_module.c

src/http/ngx_http_parse.c

src/http/ngx_http_parse_time.c

src/http/ngx_http_postpone_filter_module.c

src/http/ngx_http_request.c

src/http/ngx_http_request.h

src/http/ngx_http_request_body.c

src/http/ngx_http_script.c

src/http/ngx_http_script.h

src/http/ngx_http_special_response.c

src/http/ngx_http_upstream.c

src/http/ngx_http_upstream.h

src/http/ngx_http_upstream_round_robin.c

src/http/ngx_http_upstream_round_robin.h

src/http/ngx_http_variables.c

src/http/ngx_http_variables.h

src/http/ngx_http_write_filter_module.c

src/mail/ngx_mail.c

src/mail/ngx_mail.h

src/mail/ngx_mail_auth_http_module.c

src/mail/ngx_mail_core_module.c

src/mail/ngx_mail_handler.c

src/mail/ngx_mail_imap_handler.c

src/mail/ngx_mail_imap_module.c

src/mail/ngx_mail_imap_module.h

src/mail/ngx_mail_parse.c

src/mail/ngx_mail_pop3_handler.c

src/mail/ngx_mail_pop3_module.c

src/mail/ngx_mail_pop3_module.h

src/mail/ngx_mail_proxy_module.c

src/mail/ngx_mail_smtp_handler.c

src/mail/ngx_mail_smtp_module.c

src/mail/ngx_mail_smtp_module.h

src/mail/ngx_mail_ssl_module.c

src/mail/ngx_mail_ssl_module.h

src/misc/ngx_google_perftools_module.c

src/os/unix/ngx_aio_read.c

src/os/unix/ngx_aio_read_chain.c

src/os/unix/ngx_aio_write.c

src/os/unix/ngx_aio_write_chain.c

src/os/unix/ngx_alloc.c

src/os/unix/ngx_alloc.h

src/os/unix/ngx_atomic.h

src/os/unix/ngx_channel.c

src/os/unix/ngx_channel.h

src/os/unix/ngx_daemon.c

src/os/unix/ngx_errno.c

src/os/unix/ngx_errno.h

src/os/unix/ngx_files.c

src/os/unix/ngx_files.h

src/os/unix/ngx_freebsd.h

src/os/unix/ngx_freebsd_config.h

src/os/unix/ngx_freebsd_init.c

src/os/unix/ngx_freebsd_rfork_thread.c

src/os/unix/ngx_freebsd_rfork_thread.h

src/os/unix/ngx_freebsd_sendfile_chain.c

src/os/unix/ngx_gcc_atomic_amd64.h

src/os/unix/ngx_gcc_atomic_ppc.h

src/os/unix/ngx_gcc_atomic_sparc64.h

src/os/unix/ngx_gcc_atomic_x86.h

src/os/unix/ngx_linux.h

src/os/unix/ngx_linux_config.h

src/os/unix/ngx_linux_init.c

src/os/unix/ngx_linux_sendfile_chain.c

src/os/unix/ngx_os.h

src/os/unix/ngx_posix_config.h

src/os/unix/ngx_posix_init.c

src/os/unix/ngx_process.c

src/os/unix/ngx_process.h

src/os/unix/ngx_process_cycle.c

src/os/unix/ngx_process_cycle.h

src/os/unix/ngx_pthread_thread.c

src/os/unix/ngx_readv_chain.c

src/os/unix/ngx_recv.c

src/os/unix/ngx_send.c

src/os/unix/ngx_setproctitle.c

src/os/unix/ngx_setproctitle.h

src/os/unix/ngx_shmem.c

src/os/unix/ngx_shmem.h

src/os/unix/ngx_socket.c

src/os/unix/ngx_socket.h

src/os/unix/ngx_solaris.h

src/os/unix/ngx_solaris_config.h

src/os/unix/ngx_solaris_init.c

src/os/unix/ngx_solaris_sendfilev_chain.c

src/os/unix/ngx_sunpro_amd64.il

src/os/unix/ngx_sunpro_atomic_sparc64.h

src/os/unix/ngx_sunpro_sparc64.il

src/os/unix/ngx_sunpro_x86.il

src/os/unix/ngx_thread.h

src/os/unix/ngx_time.c

src/os/unix/ngx_time.h

src/os/unix/ngx_udp_recv.c

src/os/unix/ngx_user.c

src/os/unix/ngx_user.h

src/os/unix/ngx_writev_chain.c

src/os/unix/rfork_thread.S

Show diffs side-by-side

added added

removed removed

auto/lib/pcre/patch.pcre.c

--- pcre.c Thu Aug 21 14:43:07 2003

+++ pcre.c Tue Mar 22 12:56:59 2005

@@ -246,8 +246,8 @@

extern "C" void (*pcre_free)(void *) = free;

extern "C" int (*pcre_callout)(pcre_callout_block *) = NULL;

#else

-void *(*pcre_malloc)(size_t) = malloc;

-void (*pcre_free)(void *) = free;

+void *(__cdecl *pcre_malloc)(size_t) = malloc;

+void (__cdecl *pcre_free)(void *) = free;

int (*pcre_callout)(pcre_callout_block *) = NULL;

#endif

Older »