From f31b244f90776cfd6fdf405f661b2877b31f0278 Mon Sep 17 00:00:00 2001
From: Bruce Allen <bruce.allen@aei.mpg.de>
Date: Sun, 2 Jan 2005 18:29:53 +0000
Subject: [PATCH] Modified CVS id strings.  After some fussing with different
 versions of gcc to try and force them to not complain with -Wall but to
 always include this, I decided to take a simpler approach.  All these strings
 now have global linkage.  To prevent namespace conflicts they all have
 different names.  For the record, the variable extension is a hash made of
 the first ten characters of the md5sum of the file path, eg:    
 md5hash=`boinc/api/x_opengl.C | md5sum | cut -c 1-10`

svn path=/trunk/boinc/; revision=4979
---
 api/api_app.C                                      |  6 +-----
 api/api_test.C                                     |  6 +-----
 api/bmplib.C                                       |  6 +-----
 api/boinc_api.C                                    |  6 +-----
 api/boinc_api_fortran.C                            |  6 +-----
 api/boinc_checkpoint.C                             |  6 +-----
 api/graphics_api.C                                 |  6 +-----
 api/graphics_data.C                                |  6 +-----
 api/graphics_impl.C                                |  6 +-----
 api/graphics_impl_lib.C                            |  6 +-----
 api/graphics_lib.C                                 |  6 +-----
 api/gutil.C                                        |  6 +-----
 api/reduce.C                                       |  6 +-----
 api/static_graphics.C                              |  6 +-----
 api/tgalib.C                                       |  6 +-----
 api/windows_opengl.C                               |  6 +-----
 api/x_opengl.C                                     |  6 +-----
 apps/1sec.C                                        |  6 +-----
 apps/concat.C                                      |  6 +-----
 apps/error.C                                       |  6 +-----
 apps/upper_case.C                                  |  6 +-----
 client/app.C                                       |  6 +-----
 client/app_control.C                               |  6 +-----
 client/app_graphics.C                              |  6 +-----
 client/app_start.C                                 |  6 +-----
 client/check_state.C                               |  6 +-----
 client/client_msgs.C                               |  6 +-----
 client/client_state.C                              |  6 +-----
 client/client_types.C                              |  6 +-----
 client/cs_account.C                                |  6 +-----
 client/cs_apps.C                                   |  6 +-----
 client/cs_benchmark.C                              |  6 +-----
 client/cs_cmdline.C                                |  6 +-----
 client/cs_data.C                                   |  6 +-----
 client/cs_files.C                                  |  6 +-----
 client/cs_prefs.C                                  |  6 +-----
 client/cs_scheduler.C                              |  6 +-----
 client/cs_statefile.C                              |  6 +-----
 client/cs_trickle.C                                |  6 +-----
 client/dhrystone.C                                 |  6 +-----
 client/dhrystone2.C                                |  6 +-----
 client/file_names.C                                |  6 +-----
 client/file_xfer.C                                 |  6 +-----
 client/gui_rpc_server.C                            |  6 +-----
 client/gui_titles.C                                |  6 +-----
 client/hostinfo_network.C                          |  6 +-----
 client/hostinfo_unix.C                             |  6 +-----
 client/http.C                                      |  6 +-----
 client/log_flags.C                                 |  6 +-----
 client/mac/mac_about.cpp                           |  6 +-----
 client/mac/mac_join.cpp                            |  6 +-----
 client/mac/mac_main.cpp                            |  6 +-----
 client/mac/mac_prefs.cpp                           |  6 +-----
 client/main.C                                      |  6 +-----
 client/net_stats.C                                 |  6 +-----
 client/net_xfer.C                                  |  6 +-----
 client/pers_file_xfer.C                            |  6 +-----
 client/proxy.C                                     |  6 +-----
 client/scheduler_op.C                              |  6 +-----
 client/ss_logic.C                                  |  6 +-----
 client/ssl_http.C                                  |  6 +-----
 client/ssl_net_xfer.C                              |  6 +-----
 client/test_file_xfer.C                            |  6 +-----
 client/test_http.C                                 |  6 +-----
 client/test_net_xfer.C                             |  6 +-----
 client/time_stats.C                                |  6 +-----
 client/whetstone.C                                 |  6 +-----
 client/win/HeapCheck/CplusCheck.cpp                |  6 +-----
 client/win/HeapCheck/HeapCheck.c                   |  6 +-----
 client/win/HeapCheck/testApp.cpp                   |  6 +-----
 client/win/StdAfx.cpp                              |  6 +-----
 client/win/cpuid_tbl.cpp                           |  6 +-----
 client/win/hostinfo_win.cpp                        |  6 +-----
 client/win/opt_x86cpu.cpp                          |  6 +-----
 client/win/win_idle_tracker.cpp                    |  6 +-----
 client/win/win_net.cpp                             |  6 +-----
 client/win/win_screensaver.cpp                     |  7 +------
 client/win/win_service.cpp                         |  6 +-----
 client/win/win_util.cpp                            |  6 +-----
 client/win/wingui.cpp                              |  6 +-----
 client/win/wingui_dialog.cpp                       |  6 +-----
 client/win/wingui_listctrl.cpp                     |  6 +-----
 client/win/wingui_mainwindow.cpp                   |  6 +-----
 client/win/wingui_piectrl.cpp                      |  6 +-----
 client/win/wingui_proxydlg.cpp                     |  6 +-----
 client/win/wingui_sswindow.cpp                     |  6 +-----
 clientgui/BOINCBaseView.cpp                        |  6 +-----
 clientgui/BOINCGUIApp.cpp                          |  6 +-----
 clientgui/BOINCListCtrl.cpp                        |  6 +-----
 clientgui/BOINCTaskBar.cpp                         |  6 +-----
 clientgui/BOINCTaskCtrl.cpp                        |  6 +-----
 clientgui/DlgAbout.cpp                             |  6 +-----
 clientgui/DlgAttachProject.cpp                     |  6 +-----
 clientgui/DlgConnection.cpp                        |  6 +-----
 clientgui/DlgOptions.cpp                           |  6 +-----
 clientgui/MainDocument.cpp                         |  6 +-----
 clientgui/MainFrame.cpp                            |  6 +-----
 clientgui/ValidateAccountKey.cpp                   | 14 +++++++++-----
 clientgui/ValidateURL.cpp                          | 14 +++++++++-----
 clientgui/ViewMessages.cpp                         |  6 +-----
 clientgui/ViewProjects.cpp                         |  6 +-----
 clientgui/ViewResources.cpp                        |  6 +-----
 clientgui/ViewTransfers.cpp                        |  6 +-----
 clientgui/ViewWork.cpp                             |  6 +-----
 clientgui/msw/taskbarex.cpp                        |  6 +-----
 clientgui/stdwx.cpp                                | 14 +++++++++-----
 db/boinc_db.C                                      |  6 +-----
 db/db_base.C                                       |  6 +-----
 lib/app_ipc.C                                      |  6 +-----
 lib/base64.C                                       |  6 +-----
 lib/crypt.C                                        |  6 +-----
 lib/crypt_prog.C                                   |  6 +-----
 lib/diagnostics.C                                  |  6 +-----
 lib/exception.C                                    |  6 +-----
 lib/filesys.C                                      |  6 +-----
 lib/gui_rpc_client.C                               |  6 +-----
 lib/gui_test.C                                     |  6 +-----
 lib/hostinfo.C                                     |  6 +-----
 lib/language.C                                     |  6 +-----
 lib/md5.c                                          |  6 +-----
 lib/md5_file.C                                     |  6 +-----
 lib/md5_test.C                                     |  6 +-----
 lib/mem_usage.C                                    |  6 +-----
 lib/mfile.C                                        |  6 +-----
 lib/miofile.C                                      |  6 +-----
 lib/msg_log.C                                      |  6 +-----
 lib/msg_queue.C                                    |  6 +-----
 lib/msg_test.C                                     |  6 +-----
 lib/parse.C                                        |  6 +-----
 lib/prefs.C                                        |  6 +-----
 lib/proxy_info.C                                   |  6 +-----
 lib/shmem.C                                        |  6 +-----
 lib/shmem_test.C                                   |  6 +-----
 lib/stackwalker_win.cpp                            |  6 +-----
 lib/susp.C                                         |  6 +-----
 lib/synch.C                                        |  6 +-----
 lib/synch_test.C                                   |  6 +-----
 lib/util.C                                         |  6 +-----
 sched/assimilator.C                                |  6 +-----
 sched/assimilator_placeholder.C                    |  6 +-----
 sched/db_dump.C                                    |  6 +-----
 sched/db_purge.C                                   |  6 +-----
 sched/delete_file.C                                |  6 +-----
 sched/feeder.C                                     |  6 +-----
 sched/file_deleter.C                               |  6 +-----
 sched/file_upload_handler.C                        |  6 +-----
 sched/get_file.C                                   |  6 +-----
 sched/handle_request.C                             |  6 +-----
 sched/main.C                                       |  6 +-----
 sched/make_work.C                                  |  6 +-----
 sched/message_handler.C                            |  6 +-----
 sched/request_file_list.C                          |  6 +-----
 sched/sample_bitwise_validator.C                   |  6 +-----
 sched/sample_dummy_assimilator.C                   |  6 +-----
 sched/sample_trivial_validator.C                   |  6 +-----
 sched/sched_config.C                               |  6 +-----
 sched/sched_locality.C                             |  6 +-----
 sched/sched_msgs.C                                 |  6 +-----
 sched/sched_send.C                                 |  6 +-----
 sched/sched_shmem.C                                |  6 +-----
 sched/sched_util.C                                 |  6 +-----
 sched/send_file.C                                  |  6 +-----
 sched/server_types.C                               |  6 +-----
 sched/show_shmem.C                                 |  6 +-----
 sched/transitioner.C                               |  6 +-----
 sched/trickle_handler.C                            |  6 +-----
 sched/update_stats.C                               |  6 +-----
 sched/validate_util.C                              |  6 +-----
 sched/validator.C                                  |  6 +-----
 sched/validator_placeholder.C                      |  6 +-----
 sched/wu_check.C                                   |  6 +-----
 tools/backend_lib.C                                |  6 +-----
 tools/create_work.C                                |  6 +-----
 tools/dir_hier_move.C                              |  6 +-----
 tools/dir_hier_path.C                              |  6 +-----
 tools/hr_db_convert.C                              |  6 +-----
 tools/process_result_template.C                    |  6 +-----
 tools/sign_executable.C                            |  6 +-----
 .../boinc_setup_commit/boinc_setup_commit.cpp      |  6 +-----
 .../GrantServiceExecutionRight.cpp                 |  6 +-----
 .../src/GrantServiceExecutionRight/lsaprivs.cpp    |  6 +-----
 .../src/GrantServiceExecutionRight/stdafx.cpp      |  6 +-----
 zip/boinc_zip.cpp                                  |  6 +-----
 zip/test.c                                         |  6 +-----
 zip/unzip/api.c                                    |  6 +-----
 zip/unzip/apihelp.c                                |  6 +-----
 zip/unzip/crc32.c                                  |  6 +-----
 zip/unzip/crctab.c                                 |  6 +-----
 zip/unzip/crypt.c                                  |  6 +-----
 zip/unzip/envargs.c                                |  6 +-----
 zip/unzip/explode.c                                |  6 +-----
 zip/unzip/extract.c                                |  6 +-----
 zip/unzip/fileio.c                                 |  6 +-----
 zip/unzip/funzip.c                                 |  6 +-----
 zip/unzip/gbloffs.c                                |  6 +-----
 zip/unzip/globals.c                                |  6 +-----
 zip/unzip/inflate.c                                |  6 +-----
 zip/unzip/list.c                                   |  6 +-----
 zip/unzip/macos/source/getenv.c                    |  6 +-----
 zip/unzip/macos/source/helpers.c                   |  6 +-----
 zip/unzip/macos/source/macbin3.c                   |  6 +-----
 zip/unzip/macos/source/macdir.c                    |  6 +-----
 zip/unzip/macos/source/macos.c                     |  6 +-----
 zip/unzip/macos/source/macscreen.c                 |  6 +-----
 zip/unzip/macos/source/macstat.c                   |  6 +-----
 zip/unzip/macos/source/mactime.c                   |  6 +-----
 zip/unzip/macos/source/macunzip.c                  |  6 +-----
 zip/unzip/macos/source/pathname.c                  |  6 +-----
 zip/unzip/macos/source/sxunzip.c                   |  6 +-----
 zip/unzip/match.c                                  |  6 +-----
 zip/unzip/process.c                                |  6 +-----
 zip/unzip/timezone.c                               |  6 +-----
 zip/unzip/ttyio.c                                  |  6 +-----
 zip/unzip/unix/unix.c                              |  6 +-----
 zip/unzip/unreduce.c                               |  6 +-----
 zip/unzip/unshrink.c                               |  6 +-----
 zip/unzip/unzip.c                                  |  6 +-----
 zip/unzip/unzipstb.c                               |  6 +-----
 zip/unzip/win32/crc_i386.c                         |  6 +-----
 zip/unzip/win32/nt.c                               |  6 +-----
 zip/unzip/win32/win32.c                            |  6 +-----
 zip/unzip/zipinfo.c                                |  6 +-----
 zip/zip/deflate.c                                  |  6 +-----
 zip/zip/macos/source/extrafld.c                    |  6 +-----
 zip/zip/macos/source/getenv.c                      |  6 +-----
 zip/zip/macos/source/helpers.c                     |  6 +-----
 zip/zip/macos/source/macopen.c                     |  6 +-----
 zip/zip/macos/source/macos.c                       |  6 +-----
 zip/zip/macos/source/macstuff.c                    |  6 +-----
 zip/zip/macos/source/mactime.c                     |  6 +-----
 zip/zip/macos/source/pathname.c                    |  6 +-----
 zip/zip/macos/source/recurse.c                     |  6 +-----
 zip/zip/macos/source/unixlike.c                    |  6 +-----
 zip/zip/mktime.c                                   |  6 +-----
 zip/zip/trees.c                                    |  6 +-----
 zip/zip/unix/z_unix.c                              |  6 +-----
 zip/zip/util.c                                     |  6 +-----
 zip/zip/win32/crc_i386.c                           |  6 +-----
 zip/zip/win32/nt.c                                 |  6 +-----
 zip/zip/win32/win32zip.c                           |  6 +-----
 zip/zip/win32/z_win32.c                            |  6 +-----
 zip/zip/z_api.c                                    |  6 +-----
 zip/zip/z_crc32.c                                  |  6 +-----
 zip/zip/z_crctab.c                                 |  6 +-----
 zip/zip/z_crypt.c                                  |  6 +-----
 zip/zip/z_fileio.c                                 |  6 +-----
 zip/zip/z_globals.c                                |  6 +-----
 zip/zip/z_ttyio.c                                  |  6 +-----
 zip/zip/zip.c                                      |  6 +-----
 zip/zip/zipcloak.c                                 |  6 +-----
 zip/zip/zipfile.c                                  |  6 +-----
 zip/zip/zipnote.c                                  |  6 +-----
 zip/zip/zipsplit.c                                 |  6 +-----
 zip/zip/zipup.c                                    |  6 +-----
 zip/ziptest.cpp                                    |  6 +-----
 255 files changed, 279 insertions(+), 1276 deletions(-)

diff --git a/api/api_app.C b/api/api_app.C
index eb71c0d0eb..f6b44dbaf1 100644
--- a/api/api_app.C
+++ b/api/api_app.C
@@ -108,8 +108,4 @@ int parse_args(int argc, char **argv, int& secs, int& usecs) {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_bccd17d4ec = "$Id$";
diff --git a/api/api_test.C b/api/api_test.C
index b769cb1eb8..3630b44857 100644
--- a/api/api_test.C
+++ b/api/api_test.C
@@ -104,8 +104,4 @@ int print_results(double time1, double time2, unsigned long int counter1,
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_b94ec48d11 = "$Id$";
diff --git a/api/bmplib.C b/api/bmplib.C
index 07ac8208bb..c07e7d556a 100644
--- a/api/bmplib.C
+++ b/api/bmplib.C
@@ -185,8 +185,4 @@ void DIB_BITMAP::FreeDIB_BMP()
 DIB_BITMAP::~DIB_BITMAP() { FreeDIB_BMP(); }
 	
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_1051ce617a = "$Id$";
diff --git a/api/boinc_api.C b/api/boinc_api.C
index 4f5248eb8e..fb148c0d90 100644
--- a/api/boinc_api.C
+++ b/api/boinc_api.C
@@ -627,8 +627,4 @@ bool boinc_receive_trickle_down(char* buf, int len) {
     return false;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_0fa0410386 = "$Id$";
diff --git a/api/boinc_api_fortran.C b/api/boinc_api_fortran.C
index 517049bde8..0c1d7325fc 100644
--- a/api/boinc_api_fortran.C
+++ b/api/boinc_api_fortran.C
@@ -120,8 +120,4 @@ extern "C" {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_4f5153609c = "$Id$";
diff --git a/api/boinc_checkpoint.C b/api/boinc_checkpoint.C
index 8c8f707f30..acf2dff682 100644
--- a/api/boinc_checkpoint.C
+++ b/api/boinc_checkpoint.C
@@ -264,8 +264,4 @@ void checkpoint()
 
 */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f3d3fb27ca = "$Id$";
diff --git a/api/graphics_api.C b/api/graphics_api.C
index 1c78990534..f9bb70a53b 100755
--- a/api/graphics_api.C
+++ b/api/graphics_api.C
@@ -22,8 +22,4 @@ int boinc_init_options_graphics(BOINC_OPTIONS& opt, void (*worker)()) {
     return boinc_init_options_graphics_impl(opt, worker, &boinc_main_state);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_b2ceed0813 = "$Id$";
diff --git a/api/graphics_data.C b/api/graphics_data.C
index 168af266cf..e58204f74c 100644
--- a/api/graphics_data.C
+++ b/api/graphics_data.C
@@ -76,8 +76,4 @@ void GRAPHICS_DOUBLE_BUFFER::generate_done(GRAPHICS_BUFFER* b) {
     b->state = GB_STATE_GENERATED;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_ebfbd0f929 = "$Id$";
diff --git a/api/graphics_impl.C b/api/graphics_impl.C
index 9313a41c0e..a2238e88c9 100755
--- a/api/graphics_impl.C
+++ b/api/graphics_impl.C
@@ -240,8 +240,4 @@ bool throttled_app_render(int x, int y, double t) {
     return false;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_6e92742852 = "$Id$";
diff --git a/api/graphics_impl_lib.C b/api/graphics_impl_lib.C
index 8f1acdb416..5405731d06 100644
--- a/api/graphics_impl_lib.C
+++ b/api/graphics_impl_lib.C
@@ -31,8 +31,4 @@ bool boinc_is_standalone() {
     return g_bmsp->boinc_is_standalone_hook();
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_9886dee259 = "$Id$";
diff --git a/api/graphics_lib.C b/api/graphics_lib.C
index 92bd4fddce..766b00852f 100644
--- a/api/graphics_lib.C
+++ b/api/graphics_lib.C
@@ -154,8 +154,4 @@ no_graphics:
     return 1;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_93054c7e32 = "$Id$";
diff --git a/api/gutil.C b/api/gutil.C
index b126a9a82b..50d35f2a0f 100755
--- a/api/gutil.C
+++ b/api/gutil.C
@@ -1123,8 +1123,4 @@ void print_text(const char* string) {
 
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_12bffca9ae = "$Id$";
diff --git a/api/reduce.C b/api/reduce.C
index 0c08d466f3..546632aaff 100644
--- a/api/reduce.C
+++ b/api/reduce.C
@@ -860,8 +860,4 @@ void REDUCED_ARRAY::draw_labels() {
 	ortho_done();
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_70f1fa52c7 = "$Id$";
diff --git a/api/static_graphics.C b/api/static_graphics.C
index 0199d76d23..dae42c760f 100644
--- a/api/static_graphics.C
+++ b/api/static_graphics.C
@@ -54,8 +54,4 @@ void app_graphics_resize(int w, int h) {
 void app_graphics_reread_prefs() {
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_ebba08c46e = "$Id$";
diff --git a/api/tgalib.C b/api/tgalib.C
index da22501a98..d03be5d20b 100644
--- a/api/tgalib.C
+++ b/api/tgalib.C
@@ -237,8 +237,4 @@ tImageTGA *LoadTGA(const char *filename)
 	// Return the TGA data (remember, you must free this data after you are done)
 	return pImageData;
 }
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_fa7b4ce9be = "$Id$";
diff --git a/api/windows_opengl.C b/api/windows_opengl.C
index c771991805..f9e02aa9a8 100755
--- a/api/windows_opengl.C
+++ b/api/windows_opengl.C
@@ -450,8 +450,4 @@ void win_graphics_event_loop() {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_462f482d81 = "$Id$";
diff --git a/api/x_opengl.C b/api/x_opengl.C
index 17e6e51c5c..bae6f1d32b 100644
--- a/api/x_opengl.C
+++ b/api/x_opengl.C
@@ -301,8 +301,4 @@ try_again:
     glutMainLoop();
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_c457a14644 = "$Id$";
diff --git a/apps/1sec.C b/apps/1sec.C
index 77b8257d22..351b89030c 100644
--- a/apps/1sec.C
+++ b/apps/1sec.C
@@ -36,8 +36,4 @@ int main() {
     fclose(f);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_afc4016a8b = "$Id$";
diff --git a/apps/concat.C b/apps/concat.C
index 95b8db30ce..1dad190843 100644
--- a/apps/concat.C
+++ b/apps/concat.C
@@ -153,8 +153,4 @@ int main(int argc, char** argv) {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_8254ea59c3 = "$Id$";
diff --git a/apps/error.C b/apps/error.C
index efad721564..c6b687a607 100644
--- a/apps/error.C
+++ b/apps/error.C
@@ -37,8 +37,4 @@ int main() {
     fprintf(stderr, "APP: upper_case ending, wrote %d chars\n", n);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_130fd0309d = "$Id$";
diff --git a/apps/upper_case.C b/apps/upper_case.C
index 89c3ca1e27..4a9d5a4686 100755
--- a/apps/upper_case.C
+++ b/apps/upper_case.C
@@ -286,8 +286,4 @@ bool app_render(int xs, int ys, double time_of_day) {
 
 #endif
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_33ac47a071 = "$Id$";
diff --git a/client/app.C b/client/app.C
index 4556e3226a..62fd7fd2ec 100644
--- a/client/app.C
+++ b/client/app.C
@@ -483,8 +483,4 @@ void MSG_QUEUE::msg_queue_poll(MSG_CHANNEL& channel) {
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_778b61195e = "$Id$";
diff --git a/client/app_control.C b/client/app_control.C
index fb1dac625e..b3a0b25f88 100644
--- a/client/app_control.C
+++ b/client/app_control.C
@@ -877,8 +877,4 @@ bool ACTIVE_TASK_SET::get_msgs() {
     return action;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_10ca137461 = "$Id$";
diff --git a/client/app_graphics.C b/client/app_graphics.C
index a21e119efc..3c48c7cd83 100644
--- a/client/app_graphics.C
+++ b/client/app_graphics.C
@@ -195,8 +195,4 @@ ACTIVE_TASK* CLIENT_STATE::get_next_graphics_capable_app() {
     return NULL;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_71e9cd9f4d = "$Id$";
diff --git a/client/app_start.C b/client/app_start.C
index 4da4f1c911..b11cc8beb1 100644
--- a/client/app_start.C
+++ b/client/app_start.C
@@ -547,8 +547,4 @@ int ACTIVE_TASK_SET::restart_tasks(int max_tasks) {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_be8bae8cbb = "$Id$";
diff --git a/client/check_state.C b/client/check_state.C
index c720516c88..f5f64b7986 100644
--- a/client/check_state.C
+++ b/client/check_state.C
@@ -177,8 +177,4 @@ void CLIENT_STATE::check_all() {
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_d91498c9e4 = "$Id$";
diff --git a/client/client_msgs.C b/client/client_msgs.C
index ebab72611a..f5f4a1ea58 100644
--- a/client/client_msgs.C
+++ b/client/client_msgs.C
@@ -111,8 +111,4 @@ void record_message(PROJECT* p, int priority, int now, char* message) {
     message_descs.push_front(mdp);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_9572274f4f = "$Id$";
diff --git a/client/client_state.C b/client/client_state.C
index 6c3e28cfd8..b200d8b6a4 100644
--- a/client/client_state.C
+++ b/client/client_state.C
@@ -1251,8 +1251,4 @@ int CLIENT_STATE::version() {
     return core_client_major_version*100 + core_client_minor_version;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_e836980ee1 = "$Id$";
diff --git a/client/client_types.C b/client/client_types.C
index 9f364c5ce8..36bc575b4e 100644
--- a/client/client_types.C
+++ b/client/client_types.C
@@ -1332,8 +1332,4 @@ double RESULT::estimated_cpu_time_remaining() {
     return estimated_cpu_time();
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_b81ff9a584 = "$Id$";
diff --git a/client/cs_account.C b/client/cs_account.C
index 43a782367f..12727754c6 100644
--- a/client/cs_account.C
+++ b/client/cs_account.C
@@ -284,8 +284,4 @@ int CLIENT_STATE::parse_preferences_for_user_files() {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_497223a3f8 = "$Id$";
diff --git a/client/cs_apps.C b/client/cs_apps.C
index 96eab456a0..072f06fa04 100644
--- a/client/cs_apps.C
+++ b/client/cs_apps.C
@@ -604,8 +604,4 @@ void CLIENT_STATE::handle_file_xfer_apps() {
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_7bf63ad771 = "$Id$";
diff --git a/client/cs_benchmark.C b/client/cs_benchmark.C
index 3f7a8c3b60..7d8d19cec0 100644
--- a/client/cs_benchmark.C
+++ b/client/cs_benchmark.C
@@ -408,8 +408,4 @@ bool CLIENT_STATE::are_cpu_benchmarks_running() {
     return benchmarks_running;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_97ee090db0 = "$Id$";
diff --git a/client/cs_cmdline.C b/client/cs_cmdline.C
index 1801dd6743..127bebebc6 100644
--- a/client/cs_cmdline.C
+++ b/client/cs_cmdline.C
@@ -255,8 +255,4 @@ void CLIENT_STATE::do_cmdline_actions() {
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_829bd0f60b = "$Id$";
diff --git a/client/cs_data.C b/client/cs_data.C
index ff7253aec1..55354a15bf 100644
--- a/client/cs_data.C
+++ b/client/cs_data.C
@@ -567,8 +567,4 @@ double CLIENT_STATE::proj_potentially_free(PROJECT* p) {
 
 #endif
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_c8458fed1c = "$Id$";
diff --git a/client/cs_files.C b/client/cs_files.C
index 43ad71a2f2..44d2445d41 100644
--- a/client/cs_files.C
+++ b/client/cs_files.C
@@ -253,8 +253,4 @@ bool CLIENT_STATE::handle_pers_file_xfers(double now) {
     return action;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_66410b3cab = "$Id$";
diff --git a/client/cs_prefs.C b/client/cs_prefs.C
index 356eb19f1f..0ea12c2db6 100644
--- a/client/cs_prefs.C
+++ b/client/cs_prefs.C
@@ -319,8 +319,4 @@ int PROJECT::parse_preferences_for_user_files() {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_92ad99cddf = "$Id$";
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index 07b547481e..ae472f604e 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -779,8 +779,4 @@ int CLIENT_STATE::handle_scheduler_reply(
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_d35a4a7711 = "$Id$";
diff --git a/client/cs_statefile.C b/client/cs_statefile.C
index b0e9fdee09..d2e7b12c84 100644
--- a/client/cs_statefile.C
+++ b/client/cs_statefile.C
@@ -559,8 +559,4 @@ int CLIENT_STATE::write_file_transfers_gui(MIOFILE& f) {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_375ec798cc = "$Id$";
diff --git a/client/cs_trickle.C b/client/cs_trickle.C
index 7b4b4ab001..473453b55b 100644
--- a/client/cs_trickle.C
+++ b/client/cs_trickle.C
@@ -127,8 +127,4 @@ int CLIENT_STATE::handle_trickle_down(PROJECT* project, FILE* in) {
     return ERR_XML_PARSE;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_acbefbad3d = "$Id$";
diff --git a/client/dhrystone.C b/client/dhrystone.C
index 2e4b6a5fb1..56be2abb57 100644
--- a/client/dhrystone.C
+++ b/client/dhrystone.C
@@ -241,8 +241,4 @@ void Proc_5(DS_DATA& dd)
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_5107112def = "$Id$";
diff --git a/client/dhrystone2.C b/client/dhrystone2.C
index fc27bc22f8..c0e6e64654 100644
--- a/client/dhrystone2.C
+++ b/client/dhrystone2.C
@@ -125,8 +125,4 @@ bool Func_3(Enumeration Enum_Par_Val)
 
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_20575a27a0 = "$Id$";
diff --git a/client/file_names.C b/client/file_names.C
index 51e4b14406..81527f6594 100644
--- a/client/file_names.C
+++ b/client/file_names.C
@@ -155,8 +155,4 @@ int check_unique_instance() {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_7d362a6a52 = "$Id$";
diff --git a/client/file_xfer.C b/client/file_xfer.C
index 9603897ab2..10c7775b10 100644
--- a/client/file_xfer.C
+++ b/client/file_xfer.C
@@ -253,8 +253,4 @@ bool FILE_XFER_SET::poll(double now) {
     return action;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_31ba21bea3 = "$Id$";
diff --git a/client/gui_rpc_server.C b/client/gui_rpc_server.C
index db3224d310..cec7358ac6 100644
--- a/client/gui_rpc_server.C
+++ b/client/gui_rpc_server.C
@@ -705,8 +705,4 @@ bool GUI_RPC_CONN_SET::poll(double) {
     return (n > 0);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_88dd75dd85 = "$Id$";
diff --git a/client/gui_titles.C b/client/gui_titles.C
index 6a3b0e1900..a04d22965a 100644
--- a/client/gui_titles.C
+++ b/client/gui_titles.C
@@ -53,8 +53,4 @@ char g_szMiscItems[MAX_MISC_STR][256] = {
     "Paused"
 };
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_7f109697b8 = "$Id$";
diff --git a/client/hostinfo_network.C b/client/hostinfo_network.C
index d945c1682f..7d475d4d02 100644
--- a/client/hostinfo_network.C
+++ b/client/hostinfo_network.C
@@ -164,8 +164,4 @@ int get_local_network_info(
 
 #endif
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_9275b20aa5 = "$Id$";
diff --git a/client/hostinfo_unix.C b/client/hostinfo_unix.C
index 072656696d..2f167794d3 100644
--- a/client/hostinfo_unix.C
+++ b/client/hostinfo_unix.C
@@ -575,8 +575,4 @@ bool HOST_INFO::users_idle(bool check_all_logins, double idle_time_to_run) {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_2cf92d205b = "$Id$";
diff --git a/client/http.C b/client/http.C
index 0739ffad92..21046c472a 100644
--- a/client/http.C
+++ b/client/http.C
@@ -809,8 +809,4 @@ int HTTP_OP_SET::remove(HTTP_OP* p) {
     return ERR_NOT_FOUND;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_57f273bb60 = "$Id$";
diff --git a/client/log_flags.C b/client/log_flags.C
index 72de2a8ecf..c239fb0a7d 100644
--- a/client/log_flags.C
+++ b/client/log_flags.C
@@ -132,8 +132,4 @@ void read_log_flags() {
 
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_5f23de6652 = "$Id$";
diff --git a/client/mac/mac_about.cpp b/client/mac/mac_about.cpp
index 72bd7d14ae..202ce87713 100644
--- a/client/mac/mac_about.cpp
+++ b/client/mac/mac_about.cpp
@@ -95,8 +95,4 @@ CantInstallDialogHandler:
 
 */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_c5d2599d58 = "$Id$";
diff --git a/client/mac/mac_join.cpp b/client/mac/mac_join.cpp
index 02b7629ffb..92937489cd 100644
--- a/client/mac/mac_join.cpp
+++ b/client/mac/mac_join.cpp
@@ -112,8 +112,4 @@ pascal OSStatus JoinDialogEventHandler (EventHandlerCallRef myHandler, EventRef
     return result;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f85123c042 = "$Id$";
diff --git a/client/mac/mac_main.cpp b/client/mac/mac_main.cpp
index 0f75904a07..6343e80aa1 100755
--- a/client/mac/mac_main.cpp
+++ b/client/mac/mac_main.cpp
@@ -958,8 +958,4 @@ void create_curtain() {
 void project_add_failed(PROJECT* project) {
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f788d5cc4e = "$Id$";
diff --git a/client/mac/mac_prefs.cpp b/client/mac/mac_prefs.cpp
index 1c438d5eb4..79cdc70e96 100644
--- a/client/mac/mac_prefs.cpp
+++ b/client/mac/mac_prefs.cpp
@@ -97,8 +97,4 @@ pascal OSStatus PrefsDialogEventHandler (EventHandlerCallRef myHandler, EventRef
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_362d5df8ab = "$Id$";
diff --git a/client/main.C b/client/main.C
index 98c381f000..39fe655c3d 100644
--- a/client/main.C
+++ b/client/main.C
@@ -400,8 +400,4 @@ int main(int argc, char** argv) {
 
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f02264aefe = "$Id$";
diff --git a/client/net_stats.C b/client/net_stats.C
index 8ee6f08fa6..c0813eaeb0 100644
--- a/client/net_stats.C
+++ b/client/net_stats.C
@@ -129,8 +129,4 @@ int NET_STATS::parse(MIOFILE& in) {
     return ERR_XML_PARSE;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_733b4006f5 = "$Id$";
diff --git a/client/net_xfer.C b/client/net_xfer.C
index 333fbdfd16..cd8563106f 100644
--- a/client/net_xfer.C
+++ b/client/net_xfer.C
@@ -666,8 +666,4 @@ void NET_XFER_SET::check_active(bool& up, bool& down) {
     down_active = false;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_e0a7088e04 = "$Id$";
diff --git a/client/pers_file_xfer.C b/client/pers_file_xfer.C
index eaab2792ac..c1138029b7 100644
--- a/client/pers_file_xfer.C
+++ b/client/pers_file_xfer.C
@@ -523,8 +523,4 @@ void PERS_FILE_XFER_SET::suspend() {
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_76edfcfb49 = "$Id$";
diff --git a/client/proxy.C b/client/proxy.C
index f82d4bc0f6..c32c3845ef 100644
--- a/client/proxy.C
+++ b/client/proxy.C
@@ -433,8 +433,4 @@ bool PROXY::proxy_poll() {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_ff688e91e4 = "$Id$";
diff --git a/client/scheduler_op.C b/client/scheduler_op.C
index fa7b6b3d79..42f80b9a46 100644
--- a/client/scheduler_op.C
+++ b/client/scheduler_op.C
@@ -752,8 +752,4 @@ int SCHEDULER_REPLY::parse(FILE* in, PROJECT* project) {
     return ERR_XML_PARSE;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_11c806525b = "$Id$";
diff --git a/client/ss_logic.C b/client/ss_logic.C
index 9c043122ac..0634e114d3 100644
--- a/client/ss_logic.C
+++ b/client/ss_logic.C
@@ -135,8 +135,4 @@ void SS_LOGIC::poll() {
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_dd5060e766 = "$Id$";
diff --git a/client/ssl_http.C b/client/ssl_http.C
index 7d7f8420c6..9e655093f1 100644
--- a/client/ssl_http.C
+++ b/client/ssl_http.C
@@ -1030,8 +1030,4 @@ int HTTP_OP_SET::remove(HTTP_OP* p) {
     return ERR_NOT_FOUND;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_1358be159f = "$Id$";
diff --git a/client/ssl_net_xfer.C b/client/ssl_net_xfer.C
index 89af795790..f4f7972f13 100644
--- a/client/ssl_net_xfer.C
+++ b/client/ssl_net_xfer.C
@@ -924,8 +924,4 @@ void NET_XFER_SET::check_active(bool& up, bool& down) {
     down_active = false;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_7fd7712781 = "$Id$";
diff --git a/client/test_file_xfer.C b/client/test_file_xfer.C
index c13a55e146..23fe74f834 100644
--- a/client/test_file_xfer.C
+++ b/client/test_file_xfer.C
@@ -132,8 +132,4 @@ int PERS_FILE_XFER::write(FILE* fout) {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_e3e5151a51 = "$Id$";
diff --git a/client/test_http.C b/client/test_http.C
index 7f2756b667..7c1222a8ac 100644
--- a/client/test_http.C
+++ b/client/test_http.C
@@ -100,8 +100,4 @@ int main() {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_4cff6b442d = "$Id$";
diff --git a/client/test_net_xfer.C b/client/test_net_xfer.C
index b2ffc14d84..9eeb07cc32 100644
--- a/client/test_net_xfer.C
+++ b/client/test_net_xfer.C
@@ -105,8 +105,4 @@ int main() {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_6a5fc6c730 = "$Id$";
diff --git a/client/time_stats.C b/client/time_stats.C
index 30ac96add3..e7d18b35d7 100644
--- a/client/time_stats.C
+++ b/client/time_stats.C
@@ -128,8 +128,4 @@ int TIME_STATS::parse(MIOFILE& in) {
     return ERR_XML_PARSE;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_472504d8c2 = "$Id$";
diff --git a/client/whetstone.C b/client/whetstone.C
index ec068e607c..5e6e5bb069 100644
--- a/client/whetstone.C
+++ b/client/whetstone.C
@@ -268,8 +268,4 @@ void whetstone(double& flops) {
     flops = KIPS*1000.0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_595304be61 = "$Id$";
diff --git a/client/win/HeapCheck/CplusCheck.cpp b/client/win/HeapCheck/CplusCheck.cpp
index d6a0407fa5..2aab0c5117 100755
--- a/client/win/HeapCheck/CplusCheck.cpp
+++ b/client/win/HeapCheck/CplusCheck.cpp
@@ -83,8 +83,4 @@ void operator delete[](void *p)
 
 #endif /* __cplusplus */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f7faa1da5e = "$Id$";
diff --git a/client/win/HeapCheck/HeapCheck.c b/client/win/HeapCheck/HeapCheck.c
index 2e1d13505e..14ad078964 100755
--- a/client/win/HeapCheck/HeapCheck.c
+++ b/client/win/HeapCheck/HeapCheck.c
@@ -953,8 +953,4 @@ HeapCheckShutDown()
 
 #endif
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_972eaf72ca = "$Id$";
diff --git a/client/win/HeapCheck/testApp.cpp b/client/win/HeapCheck/testApp.cpp
index 4b0fc8cfb2..e1b0ffd7b0 100755
--- a/client/win/HeapCheck/testApp.cpp
+++ b/client/win/HeapCheck/testApp.cpp
@@ -48,8 +48,4 @@ main()
 
     return 0;
 }
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_56bf366291 = "$Id$";
diff --git a/client/win/StdAfx.cpp b/client/win/StdAfx.cpp
index 277e2b6f5f..3d665d154a 100644
--- a/client/win/StdAfx.cpp
+++ b/client/win/StdAfx.cpp
@@ -7,8 +7,4 @@
 
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_b4966b2941 = "$Id$";
diff --git a/client/win/cpuid_tbl.cpp b/client/win/cpuid_tbl.cpp
index c11da6a021..8676f67f99 100644
--- a/client/win/cpuid_tbl.cpp
+++ b/client/win/cpuid_tbl.cpp
@@ -263,8 +263,4 @@ _cacheCodes cacheCodes[] = {
 	{0xFF,  0, 0, 0,   0,   0,   0}
 	};
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_92b1369deb = "$Id$";
diff --git a/client/win/hostinfo_win.cpp b/client/win/hostinfo_win.cpp
index 3195494a01..dcb83dfb45 100755
--- a/client/win/hostinfo_win.cpp
+++ b/client/win/hostinfo_win.cpp
@@ -386,8 +386,4 @@ bool HOST_INFO::users_idle(bool check_all_logins, double idle_time_to_run) {
     return false;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_37fbd07edd = "$Id$";
diff --git a/client/win/opt_x86cpu.cpp b/client/win/opt_x86cpu.cpp
index 84e3fbc6a3..4ecdc2618d 100644
--- a/client/win/opt_x86cpu.cpp
+++ b/client/win/opt_x86cpu.cpp
@@ -392,8 +392,4 @@ double calcFreq(int num_tics) {
 		* (timer2-timer1);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_4f1d3f9017 = "$Id$";
diff --git a/client/win/win_idle_tracker.cpp b/client/win/win_idle_tracker.cpp
index e8ac9fcfd0..2c379cffb6 100644
--- a/client/win/win_idle_tracker.cpp
+++ b/client/win/win_idle_tracker.cpp
@@ -127,8 +127,4 @@ int WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 	return TRUE;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_14d432d5b3 = "$Id$";
diff --git a/client/win/win_net.cpp b/client/win/win_net.cpp
index 87bc9deb34..4e7007b4c5 100644
--- a/client/win/win_net.cpp
+++ b/client/win/win_net.cpp
@@ -154,8 +154,4 @@ void NetCheck( void ) {
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_4971b5333e = "$Id$";
diff --git a/client/win/win_screensaver.cpp b/client/win/win_screensaver.cpp
index 82b7a16dda..fcee8aff5c 100755
--- a/client/win/win_screensaver.cpp
+++ b/client/win/win_screensaver.cpp
@@ -1820,9 +1820,4 @@ BOOL CScreensaver::IsConfigStartupBOINC()
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
-
+const char *BOINC_RCSID_116268c72f = "$Id$";
diff --git a/client/win/win_service.cpp b/client/win/win_service.cpp
index 84778842f6..a938878c28 100644
--- a/client/win/win_service.cpp
+++ b/client/win/win_service.cpp
@@ -349,8 +349,4 @@ VOID LogEventInfoMessage(LPTSTR lpszMsg)
 #endif
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_ad2dd5eef4 = "$Id$";
diff --git a/client/win/win_util.cpp b/client/win/win_util.cpp
index 2308c0dfa1..10b488e231 100755
--- a/client/win/win_util.cpp
+++ b/client/win/win_util.cpp
@@ -264,8 +264,4 @@ int UtilSetRegStartupStr(char *name, char *str)
 	return error;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_29271c504f = "$Id$";
diff --git a/client/win/wingui.cpp b/client/win/wingui.cpp
index 2940750a27..8b435ab04e 100755
--- a/client/win/wingui.cpp
+++ b/client/win/wingui.cpp
@@ -61,8 +61,4 @@ BOOL RequestNetConnect()
 	return FALSE;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_d2f8923348 = "$Id$";
diff --git a/client/win/wingui_dialog.cpp b/client/win/wingui_dialog.cpp
index be0adf44b4..12be17acfc 100755
--- a/client/win/wingui_dialog.cpp
+++ b/client/win/wingui_dialog.cpp
@@ -220,8 +220,4 @@ BOOL CAboutDialog::OnInitDialog()
     return TRUE;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_5a34f25aa3 = "$Id$";
diff --git a/client/win/wingui_listctrl.cpp b/client/win/wingui_listctrl.cpp
index 6bb524d6c9..bee55b3cd0 100755
--- a/client/win/wingui_listctrl.cpp
+++ b/client/win/wingui_listctrl.cpp
@@ -1064,8 +1064,4 @@ BOOL CProgressListCtrl::OnCommand(WPARAM wParam, LPARAM lParam)
 	return CListCtrl::OnCommand(wParam, lParam);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_577b1dbbc2 = "$Id$";
diff --git a/client/win/wingui_mainwindow.cpp b/client/win/wingui_mainwindow.cpp
index 8a41b2d694..7c0686aa37 100755
--- a/client/win/wingui_mainwindow.cpp
+++ b/client/win/wingui_mainwindow.cpp
@@ -2312,8 +2312,4 @@ void guiOnBenchmarksEnd()
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_3eaaa7525d = "$Id$";
diff --git a/client/win/wingui_piectrl.cpp b/client/win/wingui_piectrl.cpp
index 322070845b..ac8f567a39 100755
--- a/client/win/wingui_piectrl.cpp
+++ b/client/win/wingui_piectrl.cpp
@@ -369,8 +369,4 @@ void CPieChartCtrl::OnPaint()
 
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_1c43879c85 = "$Id$";
diff --git a/client/win/wingui_proxydlg.cpp b/client/win/wingui_proxydlg.cpp
index e6fccdd420..7bbad711b1 100644
--- a/client/win/wingui_proxydlg.cpp
+++ b/client/win/wingui_proxydlg.cpp
@@ -236,8 +236,4 @@ void CProxyServerDlg::OnOK()
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_0b4dba9b5d = "$Id$";
diff --git a/client/win/wingui_sswindow.cpp b/client/win/wingui_sswindow.cpp
index 277c2fc091..a04818ba0c 100755
--- a/client/win/wingui_sswindow.cpp
+++ b/client/win/wingui_sswindow.cpp
@@ -242,8 +242,4 @@ void CSSWindow::OnTimer(UINT uEventID)
 	}
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_e394ca1c58 = "$Id$";
diff --git a/clientgui/BOINCBaseView.cpp b/clientgui/BOINCBaseView.cpp
index 824ab1642e..7335611d3b 100644
--- a/clientgui/BOINCBaseView.cpp
+++ b/clientgui/BOINCBaseView.cpp
@@ -490,8 +490,4 @@ void CBOINCBaseView::UpdateTaskPane()
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_0a1bd38a5a = "$Id$";
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 61d084a32e..329cd707bf 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -385,8 +385,4 @@ wxInt32 CBOINCGUIApp::ShutdownSystemIdleDetection()
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_487cbf3018 = "$Id$";
diff --git a/clientgui/BOINCListCtrl.cpp b/clientgui/BOINCListCtrl.cpp
index 937e57f76a..7450c9b4bb 100644
--- a/clientgui/BOINCListCtrl.cpp
+++ b/clientgui/BOINCListCtrl.cpp
@@ -223,8 +223,4 @@ wxListItemAttr* CBOINCListCtrl::OnGetItemAttr( long item ) const
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_5cf411daa0 = "$Id$";
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index 851a63bf10..4e931778bf 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/clientgui/BOINCTaskBar.cpp
@@ -359,8 +359,4 @@ void CTaskBarIcon::CreateContextMenu()
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_531575eeaa = "$Id$";
diff --git a/clientgui/BOINCTaskCtrl.cpp b/clientgui/BOINCTaskCtrl.cpp
index 76098f901d..22ac411d52 100644
--- a/clientgui/BOINCTaskCtrl.cpp
+++ b/clientgui/BOINCTaskCtrl.cpp
@@ -354,8 +354,4 @@ wxHtmlOpeningStatus CBOINCTaskCtrl::OnOpeningURL( wxHtmlURLType type, const wxSt
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_125ef3d14d = "$Id$";
diff --git a/clientgui/DlgAbout.cpp b/clientgui/DlgAbout.cpp
index 5edb4bc497..430d8e2300 100644
--- a/clientgui/DlgAbout.cpp
+++ b/clientgui/DlgAbout.cpp
@@ -151,8 +151,4 @@ bool CDlgAbout::ShowToolTips()
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_a8d52a49e0 = "$Id$";
diff --git a/clientgui/DlgAttachProject.cpp b/clientgui/DlgAttachProject.cpp
index bf6e5f36da..83fa064cec 100644
--- a/clientgui/DlgAttachProject.cpp
+++ b/clientgui/DlgAttachProject.cpp
@@ -120,8 +120,4 @@ bool CDlgAttachProject::ShowToolTips()
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_438471f88f = "$Id$";
diff --git a/clientgui/DlgConnection.cpp b/clientgui/DlgConnection.cpp
index c96085c473..989d075e2b 100644
--- a/clientgui/DlgConnection.cpp
+++ b/clientgui/DlgConnection.cpp
@@ -100,8 +100,4 @@ bool CDlgConnection::ShowToolTips()
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_9ed9f07f0a = "$Id$";
diff --git a/clientgui/DlgOptions.cpp b/clientgui/DlgOptions.cpp
index c1ffedf935..9ccb53a8bf 100644
--- a/clientgui/DlgOptions.cpp
+++ b/clientgui/DlgOptions.cpp
@@ -363,8 +363,4 @@ bool CDlgOptions::ShowToolTips()
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_18c9f4f9ba = "$Id$";
diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index f700821bf2..d0112a8341 100644
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
@@ -2089,8 +2089,4 @@ wxInt32 CMainDocument::SetProxySOCKSPassword( const wxString& strPassword )
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_aa03a835ba = "$Id$";
diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp
index a593d73d18..fbfea4d413 100644
--- a/clientgui/MainFrame.cpp
+++ b/clientgui/MainFrame.cpp
@@ -1004,8 +1004,4 @@ void CMainFrame::OnListPanelRender( wxTimerEvent &event )
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_d881a56dc5 = "$Id$";
diff --git a/clientgui/ValidateAccountKey.cpp b/clientgui/ValidateAccountKey.cpp
index e9f0e62e6a..8ba9d5b1a6 100644
--- a/clientgui/ValidateAccountKey.cpp
+++ b/clientgui/ValidateAccountKey.cpp
@@ -21,6 +21,14 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.7  2005/01/02 18:29:20  ballen
+// Modified CVS id strings.  After some fussing with different versions
+// of gcc to try and force them to not complain with -Wall but to always
+// include this, I decided to take a simpler approach.  All these strings
+// now have global linkage.  To prevent namespace conflicts they all
+// have different names.  For the record, the variable extension is a hash made of the first ten characters of the md5sum of the file path, eg:
+//     md5hash=`boinc/api/x_opengl.C | md5sum | cut -c 1-10`
+//
 // Revision 1.6  2004/12/08 00:39:12  ballen
 // Moved RCSID strings to the end of all .c, .C and .cpp files as per
 // David's request.
@@ -174,8 +182,4 @@ bool CValidateAccountKey::CheckValidator() const
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_0c2c4c6b07 = "$Id$";
diff --git a/clientgui/ValidateURL.cpp b/clientgui/ValidateURL.cpp
index 95faf49a0b..55fbc8de5d 100644
--- a/clientgui/ValidateURL.cpp
+++ b/clientgui/ValidateURL.cpp
@@ -21,6 +21,14 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.8  2005/01/02 18:29:21  ballen
+// Modified CVS id strings.  After some fussing with different versions
+// of gcc to try and force them to not complain with -Wall but to always
+// include this, I decided to take a simpler approach.  All these strings
+// now have global linkage.  To prevent namespace conflicts they all
+// have different names.  For the record, the variable extension is a hash made of the first ten characters of the md5sum of the file path, eg:
+//     md5hash=`boinc/api/x_opengl.C | md5sum | cut -c 1-10`
+//
 // Revision 1.7  2004/12/08 00:39:12  ballen
 // Moved RCSID strings to the end of all .c, .C and .cpp files as per
 // David's request.
@@ -172,8 +180,4 @@ bool CValidateURL::CheckValidator() const
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_1f1a9f5f09 = "$Id$";
diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp
index 28615ac6c2..6287ba36b7 100644
--- a/clientgui/ViewMessages.cpp
+++ b/clientgui/ViewMessages.cpp
@@ -653,8 +653,4 @@ bool CViewMessages::CloseClipboard()
 
 #endif
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_0be7149475 = "$Id$";
diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp
index 5aae518546..1299e78f66 100644
--- a/clientgui/ViewProjects.cpp
+++ b/clientgui/ViewProjects.cpp
@@ -986,8 +986,4 @@ void CViewProjects::ExecuteLink( const wxString &strLink )
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_b4edf777fc = "$Id$";
diff --git a/clientgui/ViewResources.cpp b/clientgui/ViewResources.cpp
index 8c0f636889..b58c7f78a7 100644
--- a/clientgui/ViewResources.cpp
+++ b/clientgui/ViewResources.cpp
@@ -419,8 +419,4 @@ wxInt32 CViewResources::FormatDiskSpace( wxInt32 item, wxString& strBuffer ) con
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_5a37b46a6e = "$Id$";
diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp
index dabc7add71..fc69395a76 100644
--- a/clientgui/ViewTransfers.cpp
+++ b/clientgui/ViewTransfers.cpp
@@ -781,8 +781,4 @@ wxInt32 CViewTransfers::FormatStatus( wxInt32 item, wxString& strBuffer ) const
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_7aadb93332 = "$Id$";
diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp
index bfe17bf514..a6101dadea 100644
--- a/clientgui/ViewWork.cpp
+++ b/clientgui/ViewWork.cpp
@@ -931,8 +931,4 @@ wxInt32 CViewWork::FormatStatus( wxInt32 item, wxString& strBuffer ) const
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_34f860f736 = "$Id$";
diff --git a/clientgui/msw/taskbarex.cpp b/clientgui/msw/taskbarex.cpp
index dea4f8fd96..86dc6a9c55 100644
--- a/clientgui/msw/taskbarex.cpp
+++ b/clientgui/msw/taskbarex.cpp
@@ -406,8 +406,4 @@ LRESULT APIENTRY wxTaskBarIconExWindowProc( HWND hWnd, unsigned msg, UINT wParam
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_46d006c50e = "$Id$";
diff --git a/clientgui/stdwx.cpp b/clientgui/stdwx.cpp
index fdb08d22c2..1fd59fc82c 100644
--- a/clientgui/stdwx.cpp
+++ b/clientgui/stdwx.cpp
@@ -21,6 +21,14 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.7  2005/01/02 18:29:21  ballen
+// Modified CVS id strings.  After some fussing with different versions
+// of gcc to try and force them to not complain with -Wall but to always
+// include this, I decided to take a simpler approach.  All these strings
+// now have global linkage.  To prevent namespace conflicts they all
+// have different names.  For the record, the variable extension is a hash made of the first ten characters of the md5sum of the file path, eg:
+//     md5hash=`boinc/api/x_opengl.C | md5sum | cut -c 1-10`
+//
 // Revision 1.6  2004/12/08 00:39:13  ballen
 // Moved RCSID strings to the end of all .c, .C and .cpp files as per
 // David's request.
@@ -47,8 +55,4 @@
 // and not in this file
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_4e0e4c54ab = "$Id$";
diff --git a/db/boinc_db.C b/db/boinc_db.C
index e8cc48ee67..09a7bab020 100644
--- a/db/boinc_db.C
+++ b/db/boinc_db.C
@@ -1200,8 +1200,4 @@ int DB_SCHED_RESULT_ITEM_SET::update_workunits() {
     return db->do_query(query);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_ac374386c8 = "$Id$";
diff --git a/db/db_base.C b/db/db_base.C
index 2e00bbcb9e..53cc3e8d28 100644
--- a/db/db_base.C
+++ b/db/db_base.C
@@ -337,8 +337,4 @@ void unescape_string(char* p, int /*len*/) {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_43d919556b = "$Id$";
diff --git a/lib/app_ipc.C b/lib/app_ipc.C
index e921ed7516..23f548bb3a 100755
--- a/lib/app_ipc.C
+++ b/lib/app_ipc.C
@@ -280,8 +280,4 @@ int boinc_resolve_filename_s(const char *virtual_name, string& physical_name) {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_3add42d20e = "$Id$";
diff --git a/lib/base64.C b/lib/base64.C
index 3565b8fe1b..19356a770b 100644
--- a/lib/base64.C
+++ b/lib/base64.C
@@ -202,8 +202,4 @@ string r_base64_decode (const char* from, size_t length)
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_2b47467419 = "$Id$";
diff --git a/lib/crypt.C b/lib/crypt.C
index 597aed21e1..45120def9d 100644
--- a/lib/crypt.C
+++ b/lib/crypt.C
@@ -365,8 +365,4 @@ int read_key_file(char* keyfile, R_RSA_PRIVATE_KEY& key) {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_4f0c2e42ea = "$Id$";
diff --git a/lib/crypt_prog.C b/lib/crypt_prog.C
index ce7258bbb7..9e8e134b2d 100644
--- a/lib/crypt_prog.C
+++ b/lib/crypt_prog.C
@@ -159,8 +159,4 @@ int main(int argc, char** argv) {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_6633b596b9 = "$Id$";
diff --git a/lib/diagnostics.C b/lib/diagnostics.C
index 2c8c9d1a3f..16a6c99b98 100644
--- a/lib/diagnostics.C
+++ b/lib/diagnostics.C
@@ -510,8 +510,4 @@ void boinc_quit(int sig) {
 
 #endif
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_4967ad204c = "$Id$";
diff --git a/lib/exception.C b/lib/exception.C
index 2bd2cce42a..b0bc3b5776 100644
--- a/lib/exception.C
+++ b/lib/exception.C
@@ -125,8 +125,4 @@ long         boinc_signal_operation_exception::ErrorValue() {
     return ERR_SIGNAL_OP;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_21138c830b = "$Id$";
diff --git a/lib/filesys.C b/lib/filesys.C
index b76aee3327..0d2ae32b90 100755
--- a/lib/filesys.C
+++ b/lib/filesys.C
@@ -573,8 +573,4 @@ int get_file_dir(char* filename, char* dir) {
 
 #endif
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_636c8d709b = "$Id$";
diff --git a/lib/gui_rpc_client.C b/lib/gui_rpc_client.C
index 08c8b123a1..a4beab3b72 100644
--- a/lib/gui_rpc_client.C
+++ b/lib/gui_rpc_client.C
@@ -1454,8 +1454,4 @@ int RPC_CLIENT::quit() {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_6802bead97 = "$Id$";
diff --git a/lib/gui_test.C b/lib/gui_test.C
index 6caa86f84c..f7b946c23c 100644
--- a/lib/gui_test.C
+++ b/lib/gui_test.C
@@ -157,8 +157,4 @@ int main(int argc, char** argv) {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_77f00010ab = "$Id$";
diff --git a/lib/hostinfo.C b/lib/hostinfo.C
index 9e641eb945..57a04ee4ed 100644
--- a/lib/hostinfo.C
+++ b/lib/hostinfo.C
@@ -206,8 +206,4 @@ int HOST_INFO::write_cpu_benchmarks(FILE* out) {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_edf7e5c147 = "$Id$";
diff --git a/lib/language.C b/lib/language.C
index 3d0f5dc5b8..6f77569788 100755
--- a/lib/language.C
+++ b/lib/language.C
@@ -85,8 +85,4 @@ return_default:
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_c4c9d87372 = "$Id$";
diff --git a/lib/md5.c b/lib/md5.c
index 6841637d77..5a223551fe 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -396,8 +396,4 @@ md5_finish(md5_state_t *pms, md5_byte_t digest[16])
 	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_40448d5426 = "$Id$";
diff --git a/lib/md5_file.C b/lib/md5_file.C
index 2667888882..5b072102cc 100644
--- a/lib/md5_file.C
+++ b/lib/md5_file.C
@@ -86,8 +86,4 @@ std::string md5_string(const unsigned char* data, int nbytes)
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_5a0dc438fe = "$Id$";
diff --git a/lib/md5_test.C b/lib/md5_test.C
index 2b97fb28a4..c608f48c7b 100644
--- a/lib/md5_test.C
+++ b/lib/md5_test.C
@@ -12,8 +12,4 @@ int main(int, char** argv) {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_c6f4ef0a81 = "$Id$";
diff --git a/lib/mem_usage.C b/lib/mem_usage.C
index 59ecba68c2..25ac0f2e15 100644
--- a/lib/mem_usage.C
+++ b/lib/mem_usage.C
@@ -107,8 +107,4 @@ int mem_usage(double& vm_usage, double& resident_set) {
 #endif
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_dc202bfd53 = "$Id$";
diff --git a/lib/mfile.C b/lib/mfile.C
index 16b8dcde73..417f9c5638 100644
--- a/lib/mfile.C
+++ b/lib/mfile.C
@@ -141,8 +141,4 @@ void MFILE::get_buf(char*& b, int& l) {
     len = 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_8de9facdd7 = "$Id$";
diff --git a/lib/miofile.C b/lib/miofile.C
index cda95b2a34..1f1caa8daf 100644
--- a/lib/miofile.C
+++ b/lib/miofile.C
@@ -119,8 +119,4 @@ int copy_element_contents(MIOFILE& in, const char* end_tag, string& str) {
     return ERR_XML_PARSE;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_37339d4dc0 = "$Id$";
diff --git a/lib/msg_log.C b/lib/msg_log.C
index 04cd56d18f..9b075e12b4 100644
--- a/lib/msg_log.C
+++ b/lib/msg_log.C
@@ -192,8 +192,4 @@ void SCOPE_MSG_LOG::printf_file(
     va_end(va);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_2e9a7d8610 = "$Id$";
diff --git a/lib/msg_queue.C b/lib/msg_queue.C
index f87c160c5e..65718aa7ac 100644
--- a/lib/msg_queue.C
+++ b/lib/msg_queue.C
@@ -88,8 +88,4 @@ int destroy_message_queue(key_t key) {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_7b5e8a534b = "$Id$";
diff --git a/lib/msg_test.C b/lib/msg_test.C
index 1529cf2795..a68737846e 100644
--- a/lib/msg_test.C
+++ b/lib/msg_test.C
@@ -41,8 +41,4 @@ int main(int argc, char** argv) {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_7ce3817f4c = "$Id$";
diff --git a/lib/parse.C b/lib/parse.C
index 00036effaf..701d895833 100644
--- a/lib/parse.C
+++ b/lib/parse.C
@@ -345,8 +345,4 @@ void xml_unescape(string& in, string& out) {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_3f3de9eb18 = "$Id$";
diff --git a/lib/prefs.C b/lib/prefs.C
index 96ac34c62d..b56a439acf 100644
--- a/lib/prefs.C
+++ b/lib/prefs.C
@@ -266,8 +266,4 @@ int GLOBAL_PREFS::write(FILE* f) {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_3fb442bb02 = "$Id$";
diff --git a/lib/proxy_info.C b/lib/proxy_info.C
index 93b3395d6d..6038010a05 100644
--- a/lib/proxy_info.C
+++ b/lib/proxy_info.C
@@ -74,8 +74,4 @@ void PROXY_INFO::clear() {
     socks_version = 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_af13db88e5 = "$Id$";
diff --git a/lib/shmem.C b/lib/shmem.C
index 6169f938d9..730c5e63a1 100755
--- a/lib/shmem.C
+++ b/lib/shmem.C
@@ -162,8 +162,4 @@ int print_shmem_info(key_t key) {
 
 #endif
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f835f078de = "$Id$";
diff --git a/lib/shmem_test.C b/lib/shmem_test.C
index 928092cc74..9fb16beb60 100644
--- a/lib/shmem_test.C
+++ b/lib/shmem_test.C
@@ -29,8 +29,4 @@ int main(int argc, char** argv) {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_6911713ff8 = "$Id$";
diff --git a/lib/stackwalker_win.cpp b/lib/stackwalker_win.cpp
index 7d3e8afa43..a3d87c3c65 100644
--- a/lib/stackwalker_win.cpp
+++ b/lib/stackwalker_win.cpp
@@ -1055,8 +1055,4 @@ cleanup:
 // Critical section end...
 }  // ShowStackRM
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_e8b4633192 = "$Id$";
diff --git a/lib/susp.C b/lib/susp.C
index ea231dfcf4..9dc1da67a9 100644
--- a/lib/susp.C
+++ b/lib/susp.C
@@ -372,8 +372,4 @@ main (int argc, char *argv[])
     pthread_exit (NULL);        /* Let threads finish */
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_c9bc594954 = "$Id$";
diff --git a/lib/synch.C b/lib/synch.C
index 98fc35a134..02a748a27d 100644
--- a/lib/synch.C
+++ b/lib/synch.C
@@ -109,8 +109,4 @@ int get_key(char* path, int id, key_t& key) {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_9412b586d1 = "$Id$";
diff --git a/lib/synch_test.C b/lib/synch_test.C
index dae905addf..bb0f08fd5b 100644
--- a/lib/synch_test.C
+++ b/lib/synch_test.C
@@ -22,8 +22,4 @@ int main(int argc, char** argv) {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_7eba26a197 = "$Id$";
diff --git a/lib/util.C b/lib/util.C
index b6e5bffb30..7774b4f6e3 100755
--- a/lib/util.C
+++ b/lib/util.C
@@ -836,8 +836,4 @@ void mysql_timestamp(double dt, char* p) {
     );
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_ab65c90e1e = "$Id$";
diff --git a/sched/assimilator.C b/sched/assimilator.C
index 6cd732f65b..1abb4bb664 100644
--- a/sched/assimilator.C
+++ b/sched/assimilator.C
@@ -198,8 +198,4 @@ int main(int argc, char** argv) {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_7841370789 = "$Id$";
diff --git a/sched/assimilator_placeholder.C b/sched/assimilator_placeholder.C
index bff9a3022a..565657d134 100644
--- a/sched/assimilator_placeholder.C
+++ b/sched/assimilator_placeholder.C
@@ -64,8 +64,4 @@ int assimilate_handler(
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_119259b8d5 = "$Id$";
diff --git a/sched/db_dump.C b/sched/db_dump.C
index 95c40b3199..a935587156 100644
--- a/sched/db_dump.C
+++ b/sched/db_dump.C
@@ -785,8 +785,4 @@ int main(int argc, char** argv) {
     log_messages.printf(SCHED_MSG_LOG::NORMAL, "db_dump finished\n");
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_500089bde6 = "$Id$";
diff --git a/sched/db_purge.C b/sched/db_purge.C
index a04669e446..461b37a3fd 100644
--- a/sched/db_purge.C
+++ b/sched/db_purge.C
@@ -613,8 +613,4 @@ int main(int argc, char** argv) {
     exit(0);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_0c1c4336f1 = "$Id$";
diff --git a/sched/delete_file.C b/sched/delete_file.C
index f43246380b..d62d28084b 100644
--- a/sched/delete_file.C
+++ b/sched/delete_file.C
@@ -121,8 +121,4 @@ int main(int argc, char** argv) {
     return retval;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f6337b04b0 = "$Id$";
diff --git a/sched/feeder.C b/sched/feeder.C
index 657d7062a8..ed770cce6c 100644
--- a/sched/feeder.C
+++ b/sched/feeder.C
@@ -437,8 +437,4 @@ int main(int argc, char** argv) {
     feeder_loop();
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_57c87aa242 = "$Id$";
diff --git a/sched/file_deleter.C b/sched/file_deleter.C
index dc2f44c67f..42c600d792 100644
--- a/sched/file_deleter.C
+++ b/sched/file_deleter.C
@@ -260,8 +260,4 @@ int main(int argc, char** argv) {
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_bd0d4938a6 = "$Id$";
diff --git a/sched/file_upload_handler.C b/sched/file_upload_handler.C
index c73578a69d..5247471d8c 100644
--- a/sched/file_upload_handler.C
+++ b/sched/file_upload_handler.C
@@ -461,8 +461,4 @@ int main() {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_470a0d4d11 = "$Id$";
diff --git a/sched/get_file.C b/sched/get_file.C
index 4b98743ec7..5a93691c86 100644
--- a/sched/get_file.C
+++ b/sched/get_file.C
@@ -199,8 +199,4 @@ int main(int argc, char** argv) {
     return retval;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_37238a0141 = "$Id$";
diff --git a/sched/handle_request.C b/sched/handle_request.C
index 55e71fa5c5..bc6a4e42af 100644
--- a/sched/handle_request.C
+++ b/sched/handle_request.C
@@ -881,8 +881,4 @@ void handle_request(
     sreply.write(fout);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_2ac231f9de = "$Id$";
diff --git a/sched/main.C b/sched/main.C
index 74cfb39d23..dd7fe9f18e 100644
--- a/sched/main.C
+++ b/sched/main.C
@@ -239,8 +239,4 @@ done:
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_0ebdf5d770 = "$Id$";
diff --git a/sched/make_work.C b/sched/make_work.C
index d3c4352789..d298031d60 100644
--- a/sched/make_work.C
+++ b/sched/make_work.C
@@ -284,8 +284,4 @@ int main(int argc, char** argv) {
     make_work();
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_d24265dc7f = "$Id$";
diff --git a/sched/message_handler.C b/sched/message_handler.C
index d0166a3340..e5a11c313b 100644
--- a/sched/message_handler.C
+++ b/sched/message_handler.C
@@ -153,8 +153,4 @@ int main(int argc, char** argv) {
     main_loop(one_pass);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_ff3b9880d4 = "$Id$";
diff --git a/sched/request_file_list.C b/sched/request_file_list.C
index 7adca719da..38999e11f8 100644
--- a/sched/request_file_list.C
+++ b/sched/request_file_list.C
@@ -112,8 +112,4 @@ int main(int argc, char** argv) {
     return retval;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_41d8f8c3fa = "$Id$";
diff --git a/sched/sample_bitwise_validator.C b/sched/sample_bitwise_validator.C
index 2b515fddfe..a0848a3d40 100644
--- a/sched/sample_bitwise_validator.C
+++ b/sched/sample_bitwise_validator.C
@@ -130,8 +130,4 @@ int check_pair(
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_7ab2b7189c = "$Id$";
diff --git a/sched/sample_dummy_assimilator.C b/sched/sample_dummy_assimilator.C
index f5092cac61..ad7cbb52cb 100644
--- a/sched/sample_dummy_assimilator.C
+++ b/sched/sample_dummy_assimilator.C
@@ -57,8 +57,4 @@ int assimilate_handler(
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_8f6a5a2d27 = "$Id$";
diff --git a/sched/sample_trivial_validator.C b/sched/sample_trivial_validator.C
index 4b6307c62e..fae3ee16a8 100644
--- a/sched/sample_trivial_validator.C
+++ b/sched/sample_trivial_validator.C
@@ -70,8 +70,4 @@ int check_pair(RESULT & r1, RESULT const& r2, bool& retry) {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f3a7a34795 = "$Id$";
diff --git a/sched/sched_config.C b/sched/sched_config.C
index 6b305734f8..48b4722fd6 100644
--- a/sched/sched_config.C
+++ b/sched/sched_config.C
@@ -115,8 +115,4 @@ void get_project_dir(char* p, int len) {
     if (q) *q = 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_3704204cfd = "$Id$";
diff --git a/sched/sched_locality.C b/sched/sched_locality.C
index 51a97d79fc..fa849c9554 100644
--- a/sched/sched_locality.C
+++ b/sched/sched_locality.C
@@ -234,8 +234,4 @@ void send_work_locality(
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_238cc1aec4 = "$Id$";
diff --git a/sched/sched_msgs.C b/sched/sched_msgs.C
index 8fac2fe3f1..f9e20c94f6 100644
--- a/sched/sched_msgs.C
+++ b/sched/sched_msgs.C
@@ -38,8 +38,4 @@ bool SCHED_MSG_LOG::v_message_wanted(int kind) const {
     return ( kind <= debug_level );
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_b40ff9bb53 = "$Id$";
diff --git a/sched/sched_send.C b/sched/sched_send.C
index e9675413f8..9dfa9abb35 100644
--- a/sched/sched_send.C
+++ b/sched/sched_send.C
@@ -832,8 +832,4 @@ int send_work(
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_32dcd335e7 = "$Id$";
diff --git a/sched/sched_shmem.C b/sched/sched_shmem.C
index c2480a512a..80f950229c 100644
--- a/sched/sched_shmem.C
+++ b/sched/sched_shmem.C
@@ -210,8 +210,4 @@ void SCHED_SHMEM::restore_work(int pid) {
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_e548c94703 = "$Id$";
diff --git a/sched/sched_util.C b/sched/sched_util.C
index cd2e8e2aeb..835e538963 100644
--- a/sched/sched_util.C
+++ b/sched/sched_util.C
@@ -121,8 +121,4 @@ void get_log_path(char* p, char* filename) {
     mkdir(path, 0777);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_affa6ef1e4 = "$Id$";
diff --git a/sched/send_file.C b/sched/send_file.C
index b655157f67..b6229b8fcd 100644
--- a/sched/send_file.C
+++ b/sched/send_file.C
@@ -223,8 +223,4 @@ int main(int argc, char** argv) {
     return retval;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f3c3c4b892 = "$Id$";
diff --git a/sched/server_types.C b/sched/server_types.C
index d481488ace..b488639284 100644
--- a/sched/server_types.C
+++ b/sched/server_types.C
@@ -587,8 +587,4 @@ void GUI_URLS::get_gui_urls(USER& user, HOST& host, TEAM& team, char* buf) {
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_ea659117b3 = "$Id$";
diff --git a/sched/show_shmem.C b/sched/show_shmem.C
index de466f1f06..b4467059c4 100644
--- a/sched/show_shmem.C
+++ b/sched/show_shmem.C
@@ -68,8 +68,4 @@ int main() {
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_a370415aab = "$Id$";
diff --git a/sched/transitioner.C b/sched/transitioner.C
index d5cea668f8..91c980d02a 100644
--- a/sched/transitioner.C
+++ b/sched/transitioner.C
@@ -592,8 +592,4 @@ int main(int argc, char** argv) {
     main_loop(one_pass);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_be98c91511 = "$Id$";
diff --git a/sched/trickle_handler.C b/sched/trickle_handler.C
index 2b41d1ae42..f4386e4355 100644
--- a/sched/trickle_handler.C
+++ b/sched/trickle_handler.C
@@ -158,8 +158,4 @@ int main(int argc, char** argv) {
     main_loop(one_pass);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_560388f67e = "$Id$";
diff --git a/sched/update_stats.C b/sched/update_stats.C
index 6f92e3e830..1ba409e21e 100644
--- a/sched/update_stats.C
+++ b/sched/update_stats.C
@@ -221,8 +221,4 @@ int main(int argc, char** argv) {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_6b05e9ecce = "$Id$";
diff --git a/sched/validate_util.C b/sched/validate_util.C
index 622db8a81d..16a1df7859 100644
--- a/sched/validate_util.C
+++ b/sched/validate_util.C
@@ -248,8 +248,4 @@ int generic_check_pair(
     return retval;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_07049e8a0e = "$Id$";
diff --git a/sched/validator.C b/sched/validator.C
index 99594c953b..9ad159a600 100644
--- a/sched/validator.C
+++ b/sched/validator.C
@@ -565,8 +565,4 @@ int main(int argc, char** argv) {
     main_loop(one_pass);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_634dbda0b9 = "$Id$";
diff --git a/sched/validator_placeholder.C b/sched/validator_placeholder.C
index 7a1c505b16..ffa70d3269 100644
--- a/sched/validator_placeholder.C
+++ b/sched/validator_placeholder.C
@@ -75,8 +75,4 @@ int check_pair(RESULT & r1, RESULT const& r2, bool& retry) {
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_01a414c729 = "$Id$";
diff --git a/sched/wu_check.C b/sched/wu_check.C
index 175e6c88d1..4e004253bf 100644
--- a/sched/wu_check.C
+++ b/sched/wu_check.C
@@ -128,8 +128,4 @@ int main(int argc, char** argv) {
     printf("%d out of %d errors\n", nerr, n);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_8f4e399992 = "$Id$";
diff --git a/tools/backend_lib.C b/tools/backend_lib.C
index 543614c969..fd45425e64 100644
--- a/tools/backend_lib.C
+++ b/tools/backend_lib.C
@@ -467,8 +467,4 @@ int create_work(
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_b5f8b10eb5 = "$Id$";
diff --git a/tools/create_work.C b/tools/create_work.C
index d7d2387af6..d10881b759 100644
--- a/tools/create_work.C
+++ b/tools/create_work.C
@@ -207,8 +207,4 @@ int main(int argc, char** argv) {
     boinc_db.close();
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_3865dbbf46 = "$Id$";
diff --git a/tools/dir_hier_move.C b/tools/dir_hier_move.C
index 3c95f8992c..c4c9e78035 100644
--- a/tools/dir_hier_move.C
+++ b/tools/dir_hier_move.C
@@ -40,8 +40,4 @@ int main(int argc, char** argv) {
     }
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_d6492ba662 = "$Id$";
diff --git a/tools/dir_hier_path.C b/tools/dir_hier_path.C
index c77a9d8ab9..1df5e0c8bf 100644
--- a/tools/dir_hier_path.C
+++ b/tools/dir_hier_path.C
@@ -18,8 +18,4 @@ int main(int argc, char** argv) {
     printf("path: %s%s\n", config.download_dir, path);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_c683969ea8 = "$Id$";
diff --git a/tools/hr_db_convert.C b/tools/hr_db_convert.C
index f00ff89af1..044e178605 100644
--- a/tools/hr_db_convert.C
+++ b/tools/hr_db_convert.C
@@ -57,8 +57,4 @@ int main() {
   }
 
 };
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_b8522ef5bd = "$Id$";
diff --git a/tools/process_result_template.C b/tools/process_result_template.C
index 51a757492c..564b99a0af 100644
--- a/tools/process_result_template.C
+++ b/tools/process_result_template.C
@@ -158,8 +158,4 @@ int process_result_template(
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_e5e1e879f3 = "$Id$";
diff --git a/tools/sign_executable.C b/tools/sign_executable.C
index afc1a1c6eb..96b20baae6 100644
--- a/tools/sign_executable.C
+++ b/tools/sign_executable.C
@@ -55,8 +55,4 @@ int main(int argc, char** argv) {
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_1a27b0b4b8 = "$Id$";
diff --git a/win_build/boinc_setup_commit/boinc_setup_commit.cpp b/win_build/boinc_setup_commit/boinc_setup_commit.cpp
index 2616e473cb..1fffec6250 100644
--- a/win_build/boinc_setup_commit/boinc_setup_commit.cpp
+++ b/win_build/boinc_setup_commit/boinc_setup_commit.cpp
@@ -30,8 +30,4 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 	return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_d2f0340771 = "$Id$";
diff --git a/win_build/installerv2/redist/Windows/src/GrantServiceExecutionRight/GrantServiceExecutionRight.cpp b/win_build/installerv2/redist/Windows/src/GrantServiceExecutionRight/GrantServiceExecutionRight.cpp
index 5462071a5d..0b4981b169 100644
--- a/win_build/installerv2/redist/Windows/src/GrantServiceExecutionRight/GrantServiceExecutionRight.cpp
+++ b/win_build/installerv2/redist/Windows/src/GrantServiceExecutionRight/GrantServiceExecutionRight.cpp
@@ -221,8 +221,4 @@ UINT __stdcall GrantServiceExecutionRight(MSIHANDLE hInstall)
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_eeaf7c4c79 = "$Id$";
diff --git a/win_build/installerv2/redist/Windows/src/GrantServiceExecutionRight/lsaprivs.cpp b/win_build/installerv2/redist/Windows/src/GrantServiceExecutionRight/lsaprivs.cpp
index 7488a0f6de..8192ebec0e 100644
--- a/win_build/installerv2/redist/Windows/src/GrantServiceExecutionRight/lsaprivs.cpp
+++ b/win_build/installerv2/redist/Windows/src/GrantServiceExecutionRight/lsaprivs.cpp
@@ -248,8 +248,4 @@ OpenPolicy(
                 );
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_0a9587b165 = "$Id$";
diff --git a/win_build/installerv2/redist/Windows/src/GrantServiceExecutionRight/stdafx.cpp b/win_build/installerv2/redist/Windows/src/GrantServiceExecutionRight/stdafx.cpp
index bd07bd1ba8..711b0c75d9 100644
--- a/win_build/installerv2/redist/Windows/src/GrantServiceExecutionRight/stdafx.cpp
+++ b/win_build/installerv2/redist/Windows/src/GrantServiceExecutionRight/stdafx.cpp
@@ -7,8 +7,4 @@
 // TODO: reference any additional headers you need in STDAFX.H
 // and not in this file
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_140925f16d = "$Id$";
diff --git a/zip/boinc_zip.cpp b/zip/boinc_zip.cpp
index ed2aa2a8b5..ac21235d27 100644
--- a/zip/boinc_zip.cpp
+++ b/zip/boinc_zip.cpp
@@ -313,8 +313,4 @@ bool boinc_filelist(const std::string directory,
     return true;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_bdf38b2dfb = "$Id$";
diff --git a/zip/test.c b/zip/test.c
index 853e6b5d56..01718fe7b7 100644
--- a/zip/test.c
+++ b/zip/test.c
@@ -29,8 +29,4 @@ int main()
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_9f234ef8a3 = "$Id$";
diff --git a/zip/unzip/api.c b/zip/unzip/api.c
index 6702d684bd..8a98427778 100644
--- a/zip/unzip/api.c
+++ b/zip/unzip/api.c
@@ -609,8 +609,4 @@ int UZ_EXP UzpValidate(char *archive, int AllCodes)
 
 #endif /* DLL */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_4f32a548c6 = "$Id$";
diff --git a/zip/unzip/apihelp.c b/zip/unzip/apihelp.c
index bb119951d2..d2d3672076 100644
--- a/zip/unzip/apihelp.c
+++ b/zip/unzip/apihelp.c
@@ -154,8 +154,4 @@ C functions: -- See unzip.h for details\n\
 
 #endif /* API_DOC */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_99b98e9cf9 = "$Id$";
diff --git a/zip/unzip/crc32.c b/zip/unzip/crc32.c
index 0d99ab5f16..3bf636a4b7 100644
--- a/zip/unzip/crc32.c
+++ b/zip/unzip/crc32.c
@@ -63,8 +63,4 @@ ulg crc32(crc, buf, len)
 #endif /* !ASM_CRC */
 #endif /* !USE_ZLIB */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_7a5ef6a9d8 = "$Id$";
diff --git a/zip/unzip/crctab.c b/zip/unzip/crctab.c
index dd4070891c..400d66bb7f 100644
--- a/zip/unzip/crctab.c
+++ b/zip/unzip/crctab.c
@@ -226,8 +226,4 @@ void free_crc_table()
 
 #endif /* !USE_ZLIB || USE_OWN_CRCTAB */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f85bf4dc5f = "$Id$";
diff --git a/zip/unzip/crypt.c b/zip/unzip/crypt.c
index a94f55770e..cf8d7890ad 100644
--- a/zip/unzip/crypt.c
+++ b/zip/unzip/crypt.c
@@ -582,8 +582,4 @@ int zcr_dummy;
 
 #endif /* ?CRYPT */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_c52225ab42 = "$Id$";
diff --git a/zip/unzip/envargs.c b/zip/unzip/envargs.c
index c792863aeb..4b08fa6a4d 100644
--- a/zip/unzip/envargs.c
+++ b/zip/unzip/envargs.c
@@ -316,8 +316,4 @@ void mksargs(argcp, argvp)
 
 #endif /* MSDOS */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_8941b85739 = "$Id$";
diff --git a/zip/unzip/explode.c b/zip/unzip/explode.c
index 3822baf976..3c636f4e38 100644
--- a/zip/unzip/explode.c
+++ b/zip/unzip/explode.c
@@ -614,8 +614,4 @@ int explode(__G)
 #undef DUMPBITS
 #undef wszimpl
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_38cb7b3e92 = "$Id$";
diff --git a/zip/unzip/extract.c b/zip/unzip/extract.c
index fb1aa89b61..0c59f4320a 100644
--- a/zip/unzip/extract.c
+++ b/zip/unzip/extract.c
@@ -2270,8 +2270,4 @@ static int namecmp(s1, s2)   /* [not] used by dircomp(); swiped from Zip */
 #endif /* 0 */
 #endif /* SET_DIR_ATTRIB */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_909bf7f202 = "$Id$";
diff --git a/zip/unzip/fileio.c b/zip/unzip/fileio.c
index c99c72e402..906a7f69f2 100644
--- a/zip/unzip/fileio.c
+++ b/zip/unzip/fileio.c
@@ -2533,8 +2533,4 @@ char Far * Far zfstrcpy(char Far *s1, const char Far *s2)
 
 #endif /* SMALL_MEM */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_eb8fddfb0f = "$Id$";
diff --git a/zip/unzip/funzip.c b/zip/unzip/funzip.c
index 9a6a8b3f7e..1aeb3489d4 100644
--- a/zip/unzip/funzip.c
+++ b/zip/unzip/funzip.c
@@ -561,8 +561,4 @@ char **argv;
   RETURN (0);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_b041382118 = "$Id$";
diff --git a/zip/unzip/gbloffs.c b/zip/unzip/gbloffs.c
index 252015fa50..2f7988c0bc 100644
--- a/zip/unzip/gbloffs.c
+++ b/zip/unzip/gbloffs.c
@@ -103,8 +103,4 @@ int main(argc, argv)
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_b45580ebc4 = "$Id$";
diff --git a/zip/unzip/globals.c b/zip/unzip/globals.c
index 6c105a255f..878dea9328 100644
--- a/zip/unzip/globals.c
+++ b/zip/unzip/globals.c
@@ -213,8 +213,4 @@ Uz_Globs *globalsCtor()
     return &G;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_65afe0efe7 = "$Id$";
diff --git a/zip/unzip/inflate.c b/zip/unzip/inflate.c
index 565910c58d..da89176b16 100644
--- a/zip/unzip/inflate.c
+++ b/zip/unzip/inflate.c
@@ -1498,8 +1498,4 @@ struct huft *t;         /* table to free */
   return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_0f7484c9b3 = "$Id$";
diff --git a/zip/unzip/list.c b/zip/unzip/list.c
index 8fab6fb066..8022c0d049 100644
--- a/zip/unzip/list.c
+++ b/zip/unzip/list.c
@@ -670,8 +670,4 @@ void fnprint(__G)    /* print filename (after filtering) and newline */
 
 } /* end function fnprint() */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_670c4eb825 = "$Id$";
diff --git a/zip/unzip/macos/source/getenv.c b/zip/unzip/macos/source/getenv.c
index e5a93d7a9a..239bcf58ab 100644
--- a/zip/unzip/macos/source/getenv.c
+++ b/zip/unzip/macos/source/getenv.c
@@ -397,8 +397,4 @@ IgnoreEnvironment = tmpIgnoreEnvironment;
 
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_0094939622 = "$Id$";
diff --git a/zip/unzip/macos/source/helpers.c b/zip/unzip/macos/source/helpers.c
index df40ee5e4c..e5371bf81d 100644
--- a/zip/unzip/macos/source/helpers.c
+++ b/zip/unzip/macos/source/helpers.c
@@ -478,8 +478,4 @@ void DoWarnUserDupVol( char *FullPath )
 
 #endif
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f6b4b545d7 = "$Id$";
diff --git a/zip/unzip/macos/source/macbin3.c b/zip/unzip/macos/source/macbin3.c
index b496ca0a07..6cc0a275ac 100644
--- a/zip/unzip/macos/source/macbin3.c
+++ b/zip/unzip/macos/source/macbin3.c
@@ -762,8 +762,4 @@ static OSErr   DecodeMacBinary(Handle data, FSSpec *destination)
 
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_96de42feda = "$Id$";
diff --git a/zip/unzip/macos/source/macdir.c b/zip/unzip/macos/source/macdir.c
index f080826126..2696015511 100644
--- a/zip/unzip/macos/source/macdir.c
+++ b/zip/unzip/macos/source/macdir.c
@@ -168,8 +168,4 @@ struct dirent *readdir(DIR *dPtr)
     return dirPtr;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_ce8da9987d = "$Id$";
diff --git a/zip/unzip/macos/source/macos.c b/zip/unzip/macos/source/macos.c
index d4cadc7a52..834cffc712 100644
--- a/zip/unzip/macos/source/macos.c
+++ b/zip/unzip/macos/source/macos.c
@@ -1985,8 +1985,4 @@ else
 
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_9a13346eb1 = "$Id$";
diff --git a/zip/unzip/macos/source/macscreen.c b/zip/unzip/macos/source/macscreen.c
index f79f90f599..98c486e654 100644
--- a/zip/unzip/macos/source/macscreen.c
+++ b/zip/unzip/macos/source/macscreen.c
@@ -461,8 +461,4 @@ int macgetch(void)
     return (int)c;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_fb3c7c859b = "$Id$";
diff --git a/zip/unzip/macos/source/macstat.c b/zip/unzip/macos/source/macstat.c
index 08700d41c9..0043d84f64 100644
--- a/zip/unzip/macos/source/macstat.c
+++ b/zip/unzip/macos/source/macstat.c
@@ -186,8 +186,4 @@ int UZmacstat(const char *path, struct stat *buf)
     return (err == noErr ? 0 : -1);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_b6b6ca3001 = "$Id$";
diff --git a/zip/unzip/macos/source/mactime.c b/zip/unzip/macos/source/mactime.c
index 391fe17cea..ebc08fd460 100644
--- a/zip/unzip/macos/source/mactime.c
+++ b/zip/unzip/macos/source/mactime.c
@@ -450,8 +450,4 @@ DateTimeRec  dtr;
  return intMacTime;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_d08b93ae6f = "$Id$";
diff --git a/zip/unzip/macos/source/macunzip.c b/zip/unzip/macos/source/macunzip.c
index 748c1bb30e..651209e53c 100644
--- a/zip/unzip/macos/source/macunzip.c
+++ b/zip/unzip/macos/source/macunzip.c
@@ -849,8 +849,4 @@ int main(argc, argv) int argc; char *argv[];
 return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f7a4101d27 = "$Id$";
diff --git a/zip/unzip/macos/source/pathname.c b/zip/unzip/macos/source/pathname.c
index 6d52db0500..5d52fb0f3e 100644
--- a/zip/unzip/macos/source/pathname.c
+++ b/zip/unzip/macos/source/pathname.c
@@ -725,8 +725,4 @@ else
 return filename;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_20a7780104 = "$Id$";
diff --git a/zip/unzip/macos/source/sxunzip.c b/zip/unzip/macos/source/sxunzip.c
index c2ca8a5460..8d19063945 100644
--- a/zip/unzip/macos/source/sxunzip.c
+++ b/zip/unzip/macos/source/sxunzip.c
@@ -143,8 +143,4 @@ sprintf(UnzipVersion, "Unzip Module\n%d.%d%d%s of %s", UZ_MAJORVER,
 return UnzipVersion;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_d6fe878ae3 = "$Id$";
diff --git a/zip/unzip/match.c b/zip/unzip/match.c
index 997fb69678..3a9b2ca40a 100644
--- a/zip/unzip/match.c
+++ b/zip/unzip/match.c
@@ -342,8 +342,4 @@ int main(int argc, char **argv)
 
 #endif /* TEST_MATCH */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_7b1daf8eb1 = "$Id$";
diff --git a/zip/unzip/process.c b/zip/unzip/process.c
index 867079cc17..f3d029ffc3 100644
--- a/zip/unzip/process.c
+++ b/zip/unzip/process.c
@@ -1658,8 +1658,4 @@ zvoid *getRISCOSexfield(ef_buf, ef_len)
 
 #endif /* (RISCOS || ACORN_FTYPE_NFS) */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_678d9914bf = "$Id$";
diff --git a/zip/unzip/timezone.c b/zip/unzip/timezone.c
index 83c3ee8827..4e221d17c4 100644
--- a/zip/unzip/timezone.c
+++ b/zip/unzip/timezone.c
@@ -812,8 +812,4 @@ time_t mkgmtime(tm)
 
 #endif /* __timezone_c */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f76bfd07b8 = "$Id$";
diff --git a/zip/unzip/ttyio.c b/zip/unzip/ttyio.c
index 98afb74fa3..89765bfba1 100644
--- a/zip/unzip/ttyio.c
+++ b/zip/unzip/ttyio.c
@@ -699,8 +699,4 @@ char *getp(__G__ m, p, n)
 #endif /* CRYPT */
 #endif /* CRYPT || (UNZIP && !FUNZIP) */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_5c8ee27dba = "$Id$";
diff --git a/zip/unzip/unix/unix.c b/zip/unzip/unix/unix.c
index 2b637f5846..fdad73e445 100644
--- a/zip/unzip/unix/unix.c
+++ b/zip/unzip/unix/unix.c
@@ -1525,8 +1525,4 @@ static void qlfix(__G__ ef_ptr, ef_len)
 }
 #endif /* QLZIP */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_a72f75a0d4 = "$Id$";
diff --git a/zip/unzip/unreduce.c b/zip/unzip/unreduce.c
index 5c8ea34b08..639285682e 100644
--- a/zip/unzip/unreduce.c
+++ b/zip/unzip/unreduce.c
@@ -34,8 +34,4 @@
 
 #endif /* !COPYRIGHT_CLEAN */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_e98566230a = "$Id$";
diff --git a/zip/unzip/unshrink.c b/zip/unzip/unshrink.c
index 62b27a0e28..0e38f78a1e 100644
--- a/zip/unzip/unshrink.c
+++ b/zip/unzip/unshrink.c
@@ -313,8 +313,4 @@ static void partial_clear(__G)
 
 #endif /* !LZW_CLEAN */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_c6ab4f7f3b = "$Id$";
diff --git a/zip/unzip/unzip.c b/zip/unzip/unzip.c
index 58da6b6deb..667879adbd 100644
--- a/zip/unzip/unzip.c
+++ b/zip/unzip/unzip.c
@@ -1944,8 +1944,4 @@ int c;
   longjmp(unzipdll_error_return, c);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_b2803595c0 = "$Id$";
diff --git a/zip/unzip/unzipstb.c b/zip/unzip/unzipstb.c
index 3817e0c255..5d99d27147 100644
--- a/zip/unzip/unzipstb.c
+++ b/zip/unzip/unzipstb.c
@@ -55,8 +55,4 @@ int main(int argc, char *argv[])
     return UzpMain(argc, argv);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_0df1c7c635 = "$Id$";
diff --git a/zip/unzip/win32/crc_i386.c b/zip/unzip/win32/crc_i386.c
index f9e82f36e9..60391884ca 100644
--- a/zip/unzip/win32/crc_i386.c
+++ b/zip/unzip/win32/crc_i386.c
@@ -219,8 +219,4 @@ fine:
 #endif
 #endif /* !USE_ZLIB */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_395f9d2297 = "$Id$";
diff --git a/zip/unzip/win32/nt.c b/zip/unzip/win32/nt.c
index 36065c2980..76e3e244ed 100644
--- a/zip/unzip/win32/nt.c
+++ b/zip/unzip/win32/nt.c
@@ -666,8 +666,4 @@ static VOID InitLocalPrivileges(VOID)
 }
 #endif /* NTSD_EAS */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_247c3e8fbe = "$Id$";
diff --git a/zip/unzip/win32/win32.c b/zip/unzip/win32/win32.c
index ec0c64532b..2f3275d215 100644
--- a/zip/unzip/win32/win32.c
+++ b/zip/unzip/win32/win32.c
@@ -2755,8 +2755,4 @@ int getch_win32(void)
 }
 #endif /* !WINDLL */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_3ee56ad838 = "$Id$";
diff --git a/zip/unzip/zipinfo.c b/zip/unzip/zipinfo.c
index c35f014e7c..1e1d777dca 100644
--- a/zip/unzip/zipinfo.c
+++ b/zip/unzip/zipinfo.c
@@ -2192,8 +2192,4 @@ static char *zi_time(__G__ datetimez, modtimez, d_t_str)
 
 #endif /* !NO_ZIPINFO */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_a83f669bdc = "$Id$";
diff --git a/zip/zip/deflate.c b/zip/zip/deflate.c
index 42830fbde4..e7a5bf413a 100644
--- a/zip/zip/deflate.c
+++ b/zip/zip/deflate.c
@@ -901,8 +901,4 @@ ulg deflate()
 }
 #endif /* !USE_ZLIB */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_809a8c1dab = "$Id$";
diff --git a/zip/zip/macos/source/extrafld.c b/zip/zip/macos/source/extrafld.c
index e378e33512..4bdc8741b2 100644
--- a/zip/zip/macos/source/extrafld.c
+++ b/zip/zip/macos/source/extrafld.c
@@ -919,8 +919,4 @@ printf("\n%16s [%c%c%c%c]  [%c%c%c%c]",Fork,
     MacZip.fpb.hFileInfo.ioFlFndrInfo.fdCreator);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f3974ac6e4 = "$Id$";
diff --git a/zip/zip/macos/source/getenv.c b/zip/zip/macos/source/getenv.c
index 8c6b16d269..2af6b09caa 100644
--- a/zip/zip/macos/source/getenv.c
+++ b/zip/zip/macos/source/getenv.c
@@ -397,8 +397,4 @@ IgnoreEnvironment = tmpIgnoreEnvironment;
 
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_ff8ca61fc4 = "$Id$";
diff --git a/zip/zip/macos/source/helpers.c b/zip/zip/macos/source/helpers.c
index 75b15bf754..8c5792e01c 100644
--- a/zip/zip/macos/source/helpers.c
+++ b/zip/zip/macos/source/helpers.c
@@ -476,8 +476,4 @@ void DoWarnUserDupVol( char *FullPath )
 
 #endif
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_ca3ad280be = "$Id$";
diff --git a/zip/zip/macos/source/macopen.c b/zip/zip/macos/source/macopen.c
index 1277d853f7..ac14812649 100644
--- a/zip/zip/macos/source/macopen.c
+++ b/zip/zip/macos/source/macopen.c
@@ -362,8 +362,4 @@ int my_open(char *path, int oflag)
 
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_9a1fb79b04 = "$Id$";
diff --git a/zip/zip/macos/source/macos.c b/zip/zip/macos/source/macos.c
index 785ffc25f2..05ee09ae96 100644
--- a/zip/zip/macos/source/macos.c
+++ b/zip/zip/macos/source/macos.c
@@ -1083,8 +1083,4 @@ return ZipVersionLocal;
 
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_6f264625be = "$Id$";
diff --git a/zip/zip/macos/source/macstuff.c b/zip/zip/macos/source/macstuff.c
index def3666cc2..7cd75c5913 100644
--- a/zip/zip/macos/source/macstuff.c
+++ b/zip/zip/macos/source/macstuff.c
@@ -1723,8 +1723,4 @@ pascal  OSErr FSpGetDInfo(const FSSpec *spec,
 
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_fc2d06db64 = "$Id$";
diff --git a/zip/zip/macos/source/mactime.c b/zip/zip/macos/source/mactime.c
index 12945e0b59..778374197d 100644
--- a/zip/zip/macos/source/mactime.c
+++ b/zip/zip/macos/source/mactime.c
@@ -450,8 +450,4 @@ DateTimeRec  dtr;
  return intMacTime;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_506f517e35 = "$Id$";
diff --git a/zip/zip/macos/source/pathname.c b/zip/zip/macos/source/pathname.c
index dbdf040298..81f342f6d4 100644
--- a/zip/zip/macos/source/pathname.c
+++ b/zip/zip/macos/source/pathname.c
@@ -664,8 +664,4 @@ else
 return filename;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_510cc2090d = "$Id$";
diff --git a/zip/zip/macos/source/recurse.c b/zip/zip/macos/source/recurse.c
index 09ffc2fe05..cda9ad7165 100644
--- a/zip/zip/macos/source/recurse.c
+++ b/zip/zip/macos/source/recurse.c
@@ -441,8 +441,4 @@ if ( (Globals->cPB.hFileInfo.ioFlAttrib & ioDirMask) != 0 )
     } /* Is it a directory? */
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_efad9ca2ed = "$Id$";
diff --git a/zip/zip/macos/source/unixlike.c b/zip/zip/macos/source/unixlike.c
index 9634118a37..d3ca562da0 100644
--- a/zip/zip/macos/source/unixlike.c
+++ b/zip/zip/macos/source/unixlike.c
@@ -312,8 +312,4 @@ int chmod(char *path, int mode)
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_542e20ba5b = "$Id$";
diff --git a/zip/zip/mktime.c b/zip/zip/mktime.c
index 0f25b139a0..754ba57e39 100644
--- a/zip/zip/mktime.c
+++ b/zip/zip/mktime.c
@@ -256,8 +256,4 @@ mkgmtime(tm)
                   (unsigned long)(60 * minutes + seconds));
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_945276575a = "$Id$";
diff --git a/zip/zip/trees.c b/zip/zip/trees.c
index 298bc51d11..962d235c75 100644
--- a/zip/zip/trees.c
+++ b/zip/zip/trees.c
@@ -1363,8 +1363,4 @@ local void copy_block(block, len, header)
 
 #endif /* !USE_ZLIB */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_45621bfe77 = "$Id$";
diff --git a/zip/zip/unix/z_unix.c b/zip/zip/unix/z_unix.c
index 6dcedfc2c3..d3afd4e3b8 100644
--- a/zip/zip/unix/z_unix.c
+++ b/zip/zip/unix/z_unix.c
@@ -732,8 +732,4 @@ void version_local()
 
 } /* end function version_local() */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_e162ca2fdb = "$Id$";
diff --git a/zip/zip/util.c b/zip/zip/util.c
index 740251dd70..68f2e5f360 100644
--- a/zip/zip/util.c
+++ b/zip/zip/util.c
@@ -687,8 +687,4 @@ int printnames()
 
 #endif /* DEBUGNAMES */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_a327698ed4 = "$Id$";
diff --git a/zip/zip/win32/crc_i386.c b/zip/zip/win32/crc_i386.c
index bca4b935fa..9581096e6b 100644
--- a/zip/zip/win32/crc_i386.c
+++ b/zip/zip/win32/crc_i386.c
@@ -219,8 +219,4 @@ fine:
 #endif
 #endif /* !USE_ZLIB */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_6a68f7b22b = "$Id$";
diff --git a/zip/zip/win32/nt.c b/zip/zip/win32/nt.c
index 5a3cca75a1..9e8cc5fb76 100644
--- a/zip/zip/win32/nt.c
+++ b/zip/zip/win32/nt.c
@@ -481,8 +481,4 @@ static VOID InitLocalPrivileges(VOID)
 }
 #endif /* NTSD_EAS */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_13ad4e2be9 = "$Id$";
diff --git a/zip/zip/win32/win32zip.c b/zip/zip/win32/win32zip.c
index 16c07134df..0c7bb63e0f 100644
--- a/zip/zip/win32/win32zip.c
+++ b/zip/zip/win32/win32zip.c
@@ -772,8 +772,4 @@ char *d;                /* directory to delete */
 
 #endif /* !UTIL */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_c4c268a880 = "$Id$";
diff --git a/zip/zip/win32/z_win32.c b/zip/zip/win32/z_win32.c
index 92a30f646b..5cc26e2599 100644
--- a/zip/zip/win32/z_win32.c
+++ b/zip/zip/win32/z_win32.c
@@ -838,8 +838,4 @@ void version_local()
 } /* end function version_local() */
 #endif /* !WINDLL */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_1fddd51a9a = "$Id$";
diff --git a/zip/zip/z_api.c b/zip/zip/z_api.c
index 8ee835849d..fec14b85cb 100644
--- a/zip/zip/z_api.c
+++ b/zip/zip/z_api.c
@@ -453,8 +453,4 @@ void EXPENTRY ZpVersion(ZpVer far * p)   /* should be pointer to const struct */
     p->windll.patchlevel = DW_PATCHLEVEL;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_e99e3c832e = "$Id$";
diff --git a/zip/zip/z_crc32.c b/zip/zip/z_crc32.c
index 2d05022f42..2adeccc474 100644
--- a/zip/zip/z_crc32.c
+++ b/zip/zip/z_crc32.c
@@ -63,8 +63,4 @@ ulg crc32(crc, buf, len)
 #endif /* !ASM_CRC */
 #endif /* !USE_ZLIB */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_49357bb004 = "$Id$";
diff --git a/zip/zip/z_crctab.c b/zip/zip/z_crctab.c
index b219f57208..0bd7ca7543 100644
--- a/zip/zip/z_crctab.c
+++ b/zip/zip/z_crctab.c
@@ -226,8 +226,4 @@ void free_crc_table()
 
 #endif /* !USE_ZLIB || USE_OWN_CRCTAB */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_7b30f2d851 = "$Id$";
diff --git a/zip/zip/z_crypt.c b/zip/zip/z_crypt.c
index 3cfcf753e5..2b76ff88d5 100644
--- a/zip/zip/z_crypt.c
+++ b/zip/zip/z_crypt.c
@@ -19,8 +19,4 @@
 /* something "externally visible" to shut up compiler/linker warnings */
 int zcr_dummy;
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_6b6cadb29a = "$Id$";
diff --git a/zip/zip/z_fileio.c b/zip/zip/z_fileio.c
index 2830a8afd7..0e92665453 100644
--- a/zip/zip/z_fileio.c
+++ b/zip/zip/z_fileio.c
@@ -990,8 +990,4 @@ register unsigned int len;
 
 #endif  /* ZMEM */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_cd0cef87cc = "$Id$";
diff --git a/zip/zip/z_globals.c b/zip/zip/z_globals.c
index 73834a38d6..3fe06cc34b 100644
--- a/zip/zip/z_globals.c
+++ b/zip/zip/z_globals.c
@@ -95,8 +95,4 @@ unsigned icount = 0;            /* number of include only patterns */
 int zp_tz_is_valid;     /* signals "timezone info is available" */
 #endif
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_056e277f7d = "$Id$";
diff --git a/zip/zip/z_ttyio.c b/zip/zip/z_ttyio.c
index 3b8801f495..417f5e7bbe 100644
--- a/zip/zip/z_ttyio.c
+++ b/zip/zip/z_ttyio.c
@@ -632,8 +632,4 @@ char *getp(__G__ m, p, n)
 #endif /* CRYPT */
 #endif /* CRYPT || (UNZIP && !FUNZIP) */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_f1f55f5592 = "$Id$";
diff --git a/zip/zip/zip.c b/zip/zip/zip.c
index a392b0e504..b5d1f59dd0 100644
--- a/zip/zip/zip.c
+++ b/zip/zip/zip.c
@@ -2289,8 +2289,4 @@ nextarg: ;
 }
 
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_32cef20f4f = "$Id$";
diff --git a/zip/zip/zipcloak.c b/zip/zip/zipcloak.c
index 9febb79f72..2e2742e083 100644
--- a/zip/zip/zipcloak.c
+++ b/zip/zip/zipcloak.c
@@ -418,8 +418,4 @@ a later version) and recompile.  The Info-ZIP file `WHERE' lists sites.\n");
 
 #endif /* ?CRYPT */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_20afbe80ed = "$Id$";
diff --git a/zip/zip/zipfile.c b/zip/zip/zipfile.c
index 4e58320895..0dbdaba7eb 100644
--- a/zip/zip/zipfile.c
+++ b/zip/zip/zipfile.c
@@ -1559,8 +1559,4 @@ int trash()
 
 #endif /* !UTIL */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_c79991acf7 = "$Id$";
diff --git a/zip/zip/zipnote.c b/zip/zip/zipnote.c
index 50552fec79..de0e3c19fd 100644
--- a/zip/zip/zipnote.c
+++ b/zip/zip/zipnote.c
@@ -495,8 +495,4 @@ char **argv;            /* command line tokens */
   RETURN(0);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_74827256e1 = "$Id$";
diff --git a/zip/zip/zipsplit.c b/zip/zip/zipsplit.c
index fa98b38db2..3b3d0ed15d 100644
--- a/zip/zip/zipsplit.c
+++ b/zip/zip/zipsplit.c
@@ -805,8 +805,4 @@ char **argv;            /* command line tokens */
   RETURN(0);
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_1cee49541a = "$Id$";
diff --git a/zip/zip/zipup.c b/zip/zip/zipup.c
index 03c0ae29a8..f665e19fdb 100644
--- a/zip/zip/zipup.c
+++ b/zip/zip/zipup.c
@@ -1176,8 +1176,4 @@ ulg memcompress(tgt, tgtsize, src, srcsize)
 #endif /* ZP_NEED_MEMCOMPR */
 #endif /* !UTIL */
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_4f9eafb9f3 = "$Id$";
diff --git a/zip/ziptest.cpp b/zip/ziptest.cpp
index 33c9d3711a..3b2b2a9ded 100644
--- a/zip/ziptest.cpp
+++ b/zip/ziptest.cpp
@@ -26,8 +26,4 @@ int main(int argc, char* argv[])
     return 0;
 }
 
-#ifdef __GNUC__
-static volatile const char  __attribute__((unused)) *BOINCrcsid="$Id$";
-#else
-static volatile const char *BOINCrcsid="$Id$";
-#endif
+const char *BOINC_RCSID_9851414a72 = "$Id$";