Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

(This used to be commit f008c3b6ee324056fd9b63f6151ad6849640c959)

1 files changed, 32 insertions, 0 deletions

diff --git a/packaging/Fedora/cplusplus-headers.patch b/packaging/Fedora/cplusplus-headers.patch
new file mode 100644
index 0000000000..ce05f54599
--- /dev/null
+++ b/packaging/Fedora/cplusplus-headers.patch
@@ -0,0 +1,32 @@
+diff -Naur samba-4.0.0alpha5-orig/source/lib/events/events.h samba-4.0.0alpha5/source/lib/events/events.h
+--- samba-4.0.0alpha5-orig/source/lib/events/events.h	2008-06-30 19:34:11.000000000 +1000
++++ samba-4.0.0alpha5/source/lib/events/events.h	2008-07-25 20:02:56.000000000 +1000
+@@ -53,24 +53,24 @@
+ 
+ struct fd_event *event_add_fd(struct event_context *ev, TALLOC_CTX *mem_ctx,
+ 			      int fd, uint16_t flags, event_fd_handler_t handler,
+-			      void *private);
++			      void *private_data);
+ 
+ struct timed_event *event_add_timed(struct event_context *ev, TALLOC_CTX *mem_ctx,
+ 				    struct timeval next_event, 
+ 				    event_timed_handler_t handler, 
+-				    void *private);
++				    void *private_data);
+ 
+ struct signal_event *event_add_signal(struct event_context *ev, TALLOC_CTX *mem_ctx,
+ 				      int signum, int sa_flags,
+ 				      event_signal_handler_t handler, 
+-				      void *private);
++				      void *private_data);
+ 
+ struct iocb;
+ struct aio_event *event_add_aio(struct event_context *ev,
+ 				TALLOC_CTX *mem_ctx,
+ 				struct iocb *iocb,
+ 				event_aio_handler_t handler,
+-				void *private);
++				void *private_data);
+ 
+ int event_loop_once(struct event_context *ev);
+ int event_loop_wait(struct event_context *ev);