[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-279-gf3264ee

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit f3264ee58bc0c6ec4fef1d36bd1b3f24fb488054
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jun 12 01:30:53 2011 +0200

    Adding void as argument to functions with empty arg

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index c6cb299..a71a63c 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -564,76 +564,6 @@ def builddir(*dirs):
 -crypt_prog_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT_STATIC) $(SSL_LIBS) 
 +crypt_prog_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(SSL_LIBS)
  
---- boinc-server-6.11.0+r18946.orig/lib/diagnostics.h
-+++ boinc-server-6.11.0+r18946/lib/diagnostics.h
-@@ -70,47 +70,47 @@
- // These are functions common to all platforms
- extern int boinc_init_diagnostics( int flags );
- extern int boinc_init_graphics_diagnostics( int flags );
--extern int boinc_install_signal_handlers();
--extern int boinc_finish_diag();
-+extern int boinc_install_signal_handlers(void);
-+extern int boinc_finish_diag(void);
- 
- extern int diagnostics_init(
-     int flags, const char* stdout_prefix, const char* stderr_prefix
- );
--extern int diagnostics_finish();
--extern int diagnostics_is_initialized();
-+extern int diagnostics_finish(void);
-+extern int diagnostics_is_initialized(void);
- extern int diagnostics_is_flag_set( int flags );
- 
- // Properties
--extern char* diagnostics_get_boinc_dir();
--extern char* diagnostics_get_boinc_install_dir();
--extern char* diagnostics_get_symstore();
-+extern char* diagnostics_get_boinc_dir(void);
-+extern char* diagnostics_get_boinc_install_dir(void);
-+extern char* diagnostics_get_symstore(void);
- extern int diagnostics_set_symstore(char* symstore);
--extern int diagnostics_is_proxy_enabled();
--extern char* diagnostics_get_proxy();
-+extern int diagnostics_is_proxy_enabled(void);
-+extern char* diagnostics_get_proxy(void);
- 
--extern int diagnostics_is_aborted_via_gui();
--extern int diagnostics_set_aborted_via_gui();
-+extern int diagnostics_is_aborted_via_gui(void);
-+extern int diagnostics_set_aborted_via_gui(void);
- 
- // Log rotation
--extern int diagnostics_cycle_logs();
-+extern int diagnostics_cycle_logs(void);
- extern void diagnostics_set_max_file_sizes(int stdout_size, int stderr_size);
- 
- // Thread Tracking
--extern int diagnostics_init_thread_list();
--extern int diagnostics_finish_thread_list();
--extern int diagnostics_update_thread_list();
--extern int diagnostics_set_thread_exempt_suspend();
-+extern int diagnostics_init_thread_list(void);
-+extern int diagnostics_finish_thread_list(void);
-+extern int diagnostics_update_thread_list(void);
-+extern int diagnostics_set_thread_exempt_suspend(void);
- 
- // Message Monitoring
--extern int diagnostics_init_message_monitor();
--extern int diagnostics_finish_message_monitor();
-+extern int diagnostics_init_message_monitor(void);
-+extern int diagnostics_finish_message_monitor(void);
- #ifdef _WIN32
- extern UINT WINAPI diagnostics_message_monitor(LPVOID lpParameter);
- #endif
- 
- // Unhandled exception monitor
--extern int diagnostics_init_unhandled_exception_monitor();
--extern int diagnostics_finish_unhandled_exception_monitor();
-+extern int diagnostics_init_unhandled_exception_monitor(void);
-+extern int diagnostics_finish_unhandled_exception_monitor(void);
- #ifdef _WIN32
- extern UINT WINAPI diagnostics_unhandled_exception_monitor(LPVOID lpParameter);
- extern LONG CALLBACK boinc_catch_signal(EXCEPTION_POINTERS *ExceptionInfo);
 --- boinc-server-6.11.0+r18946.orig/lib/crypt_prog.cpp
 +++ boinc-server-6.11.0+r18946/lib/crypt_prog.cpp
 @@ -52,6 +52,9 @@
diff --git a/debian/patches/series b/debian/patches/series
index 4540852..27eac85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream_sztaki_Help_Function_Declaration_with_void.patch
 upstream_sztaki_LIBEXEC_DIR.patch
 local_sztaki_allow_world_read_and_execute_directory.patch
 AvoidingBlanksInMakefiles.patch
diff --git a/lib/diagnostics.h b/lib/diagnostics.h
index 46f65d6..e3f2377 100644
--- a/lib/diagnostics.h
+++ b/lib/diagnostics.h
@@ -70,48 +70,48 @@ extern "C" {
 // These are functions common to all platforms
 extern int boinc_init_diagnostics( int flags );
 extern int boinc_init_graphics_diagnostics( int flags );
-extern int boinc_install_signal_handlers();
-extern int boinc_finish_diag();
+extern int boinc_install_signal_handlers( void );
+extern int boinc_finish_diag( void );
 
 extern int diagnostics_init(
     int flags, const char* stdout_prefix, const char* stderr_prefix
 );
-extern int diagnostics_finish();
-extern int diagnostics_is_initialized();
+extern int diagnostics_finish( void );
+extern int diagnostics_is_initialized( void );
 extern int diagnostics_is_flag_set(int flags);
 
 // Properties
-extern char* diagnostics_get_boinc_dir();
-extern char* diagnostics_get_boinc_install_dir();
-extern char* diagnostics_get_symstore();
+extern char* diagnostics_get_boinc_dir( void );
+extern char* diagnostics_get_boinc_install_dir( void );
+extern char* diagnostics_get_symstore( void );
 extern int diagnostics_set_symstore(char* symstore);
-extern int diagnostics_is_proxy_enabled();
-extern char* diagnostics_get_proxy();
+extern int diagnostics_is_proxy_enabled( void );
+extern char* diagnostics_get_proxy( void );
 
-extern int diagnostics_is_aborted_via_gui();
-extern int diagnostics_set_aborted_via_gui();
+extern int diagnostics_is_aborted_via_gui( void );
+extern int diagnostics_set_aborted_via_gui( void );
 
 // Log rotation
-extern int diagnostics_cycle_logs();
+extern int diagnostics_cycle_logs( void );
 extern void diagnostics_set_max_file_sizes(int stdout_size, int stderr_size);
 
 // Thread Tracking
-extern int diagnostics_init_thread_list();
-extern int diagnostics_finish_thread_list();
-extern int diagnostics_update_thread_list();
-extern int diagnostics_set_thread_exempt_suspend();
+extern int diagnostics_init_thread_list( void );
+extern int diagnostics_finish_thread_list( void );
+extern int diagnostics_update_thread_list( void );
+extern int diagnostics_set_thread_exempt_suspend( void );
 extern int diagnostics_is_thread_exempt_suspend(long thread_id);
 
 // Message Monitoring
-extern int diagnostics_init_message_monitor();
-extern int diagnostics_finish_message_monitor();
+extern int diagnostics_init_message_monitor( void );
+extern int diagnostics_finish_message_monitor( void );
 #ifdef _WIN32
 extern UINT WINAPI diagnostics_message_monitor(LPVOID lpParameter);
 #endif
 
 // Unhandled exception monitor
-extern int diagnostics_init_unhandled_exception_monitor();
-extern int diagnostics_finish_unhandled_exception_monitor();
+extern int diagnostics_init_unhandled_exception_monitor( void );
+extern int diagnostics_finish_unhandled_exception_monitor( void );
 #ifdef _WIN32
 extern UINT WINAPI diagnostics_unhandled_exception_monitor(LPVOID lpParameter);
 extern LONG CALLBACK boinc_catch_signal(EXCEPTION_POINTERS *ExceptionInfo);

-- 
BOINC packaging