lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] (no subject)


From: Greg Chicares
Subject: [lmi-commits] (no subject)
Date: Sun, 5 Jun 2016 03:17:05 +0000 (UTC)

branch: master
commit 5bf279a08589d56e34f0afc6268a720939689cbb
Author: Gregory W. Chicares <address@hidden>
Date:   Sun Jun 5 01:08:45 2016 +0000

    Regularize borland conditionals
    
    This old compiler is not supported, but the conditional block
    at the beginning of every '.cpp' file may be useful in future
    for precompiled headers with other compilers
---
 about_dialog.cpp                |    4 ++--
 account_value_test.cpp          |    4 ++--
 accountvalue.cpp                |    4 ++--
 actuarial_table.cpp             |    4 ++--
 actuarial_table_test.cpp        |    4 ++--
 alert.cpp                       |    4 ++--
 alert_cgi.cpp                   |    4 ++--
 alert_cli.cpp                   |    4 ++--
 alert_test.cpp                  |    4 ++--
 alert_wx.cpp                    |    4 ++--
 antediluvian_stubs.cpp          |    4 ++--
 any_member_test.cpp             |    4 ++--
 assert_lmi_test.cpp             |    4 ++--
 authenticity.cpp                |    4 ++--
 authenticity_test.cpp           |    4 ++--
 basicvalues.cpp                 |    4 ++--
 calendar_date.cpp               |    4 ++--
 calendar_date_test.cpp          |    4 ++--
 callback_test.cpp               |    4 ++--
 census_document.cpp             |    4 ++--
 census_view.cpp                 |    4 ++--
 comma_punct_test.cpp            |    4 ++--
 commutation_functions.cpp       |    4 ++--
 commutation_functions_test.cpp  |    4 ++--
 configurable_settings.cpp       |    4 ++--
 configurable_settings.hpp       |    4 ++--
 configurable_settings_test.cpp  |    4 ++--
 contains_test.cpp               |    4 ++--
 cpp_main.cpp                    |    4 ++--
 crc32.cpp                       |    4 ++--
 crc32_test.cpp                  |    4 ++--
 custom_io_0.cpp                 |    4 ++--
 custom_io_1.cpp                 |    4 ++--
 data_directory.cpp              |    4 ++--
 database.cpp                    |    4 ++--
 database_view.cpp               |    4 ++--
 datum_base.cpp                  |    4 ++--
 datum_boolean.cpp               |    4 ++--
 datum_sequence.cpp              |    4 ++--
 datum_string.cpp                |    4 ++--
 dbdict.cpp                      |    4 ++--
 dbnames.cpp                     |    4 ++--
 dbvalue.cpp                     |    4 ++--
 death_benefits.cpp              |    4 ++--
 default_view.cpp                |    4 ++--
 docmanager_ex.cpp               |    4 ++--
 emit_ledger.cpp                 |    4 ++--
 expression_template_0_test.cpp  |    4 ++--
 facets.cpp                      |    4 ++--
 fenv_guard.cpp                  |    4 ++--
 fenv_lmi.cpp                    |    4 ++--
 fenv_lmi_test.cpp               |    4 ++--
 file_command.cpp                |    4 ++--
 file_command_cgi.cpp            |    4 ++--
 file_command_cli.cpp            |    4 ++--
 file_command_test.cpp           |    4 ++--
 file_command_wx.cpp             |    4 ++--
 financial_test.cpp              |    4 ++--
 fund_data.cpp                   |    4 ++--
 generate_passkey.cpp            |    4 ++--
 generate_product_files.cpp      |    4 ++--
 getopt.cpp                      |    4 ++--
 getopt_test.cpp                 |    4 ++--
 global_settings.cpp             |    4 ++--
 global_settings.hpp             |    4 ++--
 global_settings_test.cpp        |    4 ++--
 gpt_commutation_functions.cpp   |    4 ++--
 gpt_document.cpp                |    4 ++--
 gpt_input.cpp                   |    4 ++--
 gpt_server.cpp                  |    4 ++--
 gpt_specamt.cpp                 |    4 ++--
 gpt_state.cpp                   |    4 ++--
 gpt_test.cpp                    |    4 ++--
 gpt_view.cpp                    |    4 ++--
 gpt_xml_document.cpp            |    4 ++--
 group_quote_pdf_gen.cpp         |    4 ++--
 group_quote_pdf_gen_wx.cpp      |    4 ++--
 group_values.cpp                |    4 ++--
 handle_exceptions_test.cpp      |    4 ++--
 icon_monger.cpp                 |    4 ++--
 ieee754_test.cpp                |    4 ++--
 ihs_acctval.cpp                 |    4 ++--
 ihs_avdebug.cpp                 |    4 ++--
 ihs_avmly.cpp                   |    4 ++--
 ihs_avsolve.cpp                 |    4 ++--
 ihs_avstrtgy.cpp                |    4 ++--
 ihs_basicval.cpp                |    4 ++--
 ihs_irc7702.cpp                 |    4 ++--
 ihs_irc7702a.cpp                |    4 ++--
 ihs_mortal.cpp                  |    4 ++--
 ihs_server7702.cpp              |    4 ++--
 illustration_document.cpp       |    4 ++--
 illustration_view.cpp           |    4 ++--
 illustrator.cpp                 |    4 ++--
 input.cpp                       |    4 ++--
 input_harmonization.cpp         |    4 ++--
 input_realization.cpp           |    4 ++--
 input_seq_helpers.cpp           |    4 ++--
 input_seq_test.cpp              |    4 ++--
 input_sequence.cpp              |    4 ++--
 input_sequence_entry.cpp        |    4 ++--
 input_test.cpp                  |    4 ++--
 input_xml_io.cpp                |    4 ++--
 interest_rates.cpp              |    4 ++--
 irc7702a_test.cpp               |    4 ++--
 istream_to_string_test.cpp      |    4 ++--
 ledger.cpp                      |    4 ++--
 ledger_base.cpp                 |    4 ++--
 ledger_invariant.cpp            |    4 ++--
 ledger_text_formats.cpp         |    4 ++--
 ledger_variant.cpp              |    4 ++--
 ledger_xsl.cpp                  |    4 ++--
 ledgervalues.cpp                |    4 ++--
 license.cpp                     |    4 ++--
 lmi.cpp                         |    4 ++--
 loads.cpp                       |    4 ++--
 loads_test.cpp                  |    4 ++--
 main_cgi.cpp                    |    4 ++--
 main_cli.cpp                    |    4 ++--
 main_common.cpp                 |    4 ++--
 main_common_non_wx.cpp          |    4 ++--
 main_wx.cpp                     |    4 ++--
 main_wx_test.cpp                |    4 ++--
 map_lookup_test.cpp             |    4 ++--
 materially_equal_test.cpp       |    4 ++--
 math_functors_test.cpp          |    4 ++--
 mc_enum.cpp                     |    4 ++--
 mc_enum_test.cpp                |    4 ++--
 mc_enum_test_aux.cpp            |    4 ++--
 mc_enum_types.cpp               |    4 ++--
 mc_enum_types_aux.cpp           |    4 ++--
 mec_document.cpp                |    4 ++--
 mec_input.cpp                   |    4 ++--
 mec_server.cpp                  |    4 ++--
 mec_state.cpp                   |    4 ++--
 mec_view.cpp                    |    4 ++--
 mec_xml_document.cpp            |    4 ++--
 miscellany.cpp                  |    4 ++--
 miscellany_test.cpp             |    4 ++--
 mortality_rates.cpp             |    4 ++--
 mortality_rates_fetch.cpp       |    4 ++--
 mortality_rates_test.cpp        |    4 ++--
 msw_workarounds.cpp             |    4 ++--
 multidimgrid_any.cpp            |    4 ++--
 multiple_cell_document.cpp      |    4 ++--
 mvc_controller.cpp              |    4 ++--
 mvc_model.cpp                   |    4 ++--
 mvc_view.cpp                    |    4 ++--
 my_db.cpp                       |    4 ++--
 my_fund.cpp                     |    4 ++--
 my_prod.cpp                     |    4 ++--
 my_proem.cpp                    |    4 ++--
 my_rnd.cpp                      |    4 ++--
 my_test_coding_rules.cpp        |    4 ++--
 my_tier.cpp                     |    4 ++--
 name_value_pairs.cpp            |    4 ++--
 name_value_pairs_test.cpp       |    4 ++--
 ncnnnpnn_test.cpp               |    8 ++++----
 null_stream.cpp                 |    4 ++--
 numeric_io_cast.hpp             |    6 +++---
 numeric_io_test.cpp             |    4 ++--
 obstruct_slicing_test.cpp       |    4 ++--
 outlay.cpp                      |    4 ++--
 path_utility.cpp                |    4 ++--
 path_utility_test.cpp           |    4 ++--
 policy_document.cpp             |    4 ++--
 policy_view.cpp                 |    4 ++--
 preferences_model.cpp           |    4 ++--
 preferences_view.cpp            |    4 ++--
 premium_tax.cpp                 |    4 ++--
 premium_tax_test.cpp            |    4 ++--
 previewframe_ex.cpp             |    4 ++--
 print_matrix_test.cpp           |    4 ++--
 product_data.cpp                |    4 ++--
 product_file_test.cpp           |    4 ++--
 progress_meter.cpp              |    4 ++--
 progress_meter_cgi.cpp          |    4 ++--
 progress_meter_cli.cpp          |    4 ++--
 progress_meter_test.cpp         |    4 ++--
 progress_meter_wx.cpp           |    4 ++--
 rate_table.cpp                  |    4 ++--
 rate_table_test.cpp             |    4 ++--
 rate_table_tool.cpp             |    4 ++--
 regex_test.cpp                  |    4 ++--
 round_test.cpp                  |    4 ++--
 round_to_test.cpp               |    4 ++--
 rounding_rules.cpp              |    4 ++--
 rounding_view.cpp               |    4 ++--
 rtti_lmi_test.cpp               |    4 ++--
 safely_dereference_as_test.cpp  |    4 ++--
 sandbox_test.cpp                |    4 ++--
 sigfpe.cpp                      |    4 ++--
 single_cell_document.cpp        |    4 ++--
 single_choice_popup_menu.cpp    |    4 ++--
 skeleton.cpp                    |    4 ++--
 snprintf_test.cpp               |    4 ++--
 soa2xml.cpp                     |    4 ++--
 soa_stress_test.cpp             |    4 ++--
 solve.cpp                       |    4 ++--
 stratified_algorithms.cpp       |    4 ++--
 stratified_algorithms_test.cpp  |    4 ++--
 stratified_charges.cpp          |    4 ++--
 stream_cast_test.cpp            |    4 ++--
 surrchg_rates.cpp               |    4 ++--
 system_command.cpp              |    4 ++--
 system_command_non_wx.cpp       |    4 ++--
 system_command_test.cpp         |    4 ++--
 system_command_wx.cpp           |    4 ++--
 test_coding_rules.cpp           |    4 ++--
 test_main.cpp                   |    4 ++--
 test_tools_test.cpp             |    4 ++--
 text_doc.cpp                    |    4 ++--
 text_view.cpp                   |    4 ++--
 tier_document.cpp               |    4 ++--
 tier_view.cpp                   |    4 ++--
 timer.cpp                       |    4 ++--
 timer_test.cpp                  |    4 ++--
 tn_range_test.cpp               |    8 ++++----
 tn_range_test_aux.cpp           |    4 ++--
 tn_range_types.cpp              |    4 ++--
 transferor.cpp                  |    4 ++--
 value_cast_test.cpp             |    4 ++--
 vector_test.cpp                 |    4 ++--
 view_ex.cpp                     |    4 ++--
 wx_checks.cpp                   |    4 ++--
 wx_new.cpp                      |    4 ++--
 wx_new_test.cpp                 |    4 ++--
 wx_table_generator.cpp          |    4 ++--
 wx_test_about_version.cpp       |    4 ++--
 wx_test_benchmark_census.cpp    |    4 ++--
 wx_test_calculation_summary.cpp |    4 ++--
 wx_test_config_settings.cpp     |    4 ++--
 wx_test_create_open.cpp         |    4 ++--
 wx_test_default_input.cpp       |    4 ++--
 wx_test_default_update.cpp      |    4 ++--
 wx_test_expiry_dates.cpp        |    4 ++--
 wx_test_input_sequences.cpp     |    4 ++--
 wx_test_input_validation.cpp    |    4 ++--
 wx_test_log_errors.cpp          |    4 ++--
 wx_test_paste_census.cpp        |    4 ++--
 wx_test_pdf_create.cpp          |    4 ++--
 wx_test_validate_output.cpp     |    4 ++--
 wx_utility.cpp                  |    4 ++--
 xml_lmi.cpp                     |    4 ++--
 xml_serializable.tpp            |    8 ++++----
 xml_serialize_test.cpp          |    4 ++--
 xml_xslt_wrapp.cpp              |    4 ++--
 yare_input.cpp                  |    4 ++--
 zero_test.cpp                   |    4 ++--
 249 files changed, 505 insertions(+), 505 deletions(-)

diff --git a/about_dialog.cpp b/about_dialog.cpp
index 40fe2c0..26643b3 100644
--- a/about_dialog.cpp
+++ b/about_dialog.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "about_dialog.hpp"
 
diff --git a/account_value_test.cpp b/account_value_test.cpp
index f76a34f..357f3ac 100644
--- a/account_value_test.cpp
+++ b/account_value_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "account_value.hpp"
 
diff --git a/accountvalue.cpp b/accountvalue.cpp
index b6e90db..74581c5 100644
--- a/accountvalue.cpp
+++ b/accountvalue.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "account_value.hpp"
 
diff --git a/actuarial_table.cpp b/actuarial_table.cpp
index 7c4d4b6..c145335 100644
--- a/actuarial_table.cpp
+++ b/actuarial_table.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "actuarial_table.hpp"
 
diff --git a/actuarial_table_test.cpp b/actuarial_table_test.cpp
index a42d501..b0b2167 100644
--- a/actuarial_table_test.cpp
+++ b/actuarial_table_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "actuarial_table.hpp"
 
diff --git a/alert.cpp b/alert.cpp
index bcc87e5..8901985 100644
--- a/alert.cpp
+++ b/alert.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "alert.hpp"
 
diff --git a/alert_cgi.cpp b/alert_cgi.cpp
index c9cad36..88d69d8 100644
--- a/alert_cgi.cpp
+++ b/alert_cgi.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "alert.hpp"
 
diff --git a/alert_cli.cpp b/alert_cli.cpp
index 4e71c92..5fd7cb5 100644
--- a/alert_cli.cpp
+++ b/alert_cli.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "alert.hpp"
 
diff --git a/alert_test.cpp b/alert_test.cpp
index 6a15472..123df71 100644
--- a/alert_test.cpp
+++ b/alert_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "alert.hpp"
 
diff --git a/alert_wx.cpp b/alert_wx.cpp
index 1bdcbe2..543110d 100644
--- a/alert_wx.cpp
+++ b/alert_wx.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "alert.hpp"
 
diff --git a/antediluvian_stubs.cpp b/antediluvian_stubs.cpp
index cbf9bbe..0cc7b97 100644
--- a/antediluvian_stubs.cpp
+++ b/antediluvian_stubs.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "gpt_server.hpp"
 #include "lmi.hpp"                      // is_antediluvian_fork()
diff --git a/any_member_test.cpp b/any_member_test.cpp
index 1adacfa..ac910a0 100644
--- a/any_member_test.cpp
+++ b/any_member_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "any_member.hpp"
 
diff --git a/assert_lmi_test.cpp b/assert_lmi_test.cpp
index 33cd8ad..3f52246 100644
--- a/assert_lmi_test.cpp
+++ b/assert_lmi_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 
diff --git a/authenticity.cpp b/authenticity.cpp
index b547f66..3ac1ef5 100644
--- a/authenticity.cpp
+++ b/authenticity.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "authenticity.hpp"
 
diff --git a/authenticity_test.cpp b/authenticity_test.cpp
index a5b9d52..62cbe2d 100644
--- a/authenticity_test.cpp
+++ b/authenticity_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "authenticity.hpp"
 
diff --git a/basicvalues.cpp b/basicvalues.cpp
index 3455b9c..a2dc4f1 100644
--- a/basicvalues.cpp
+++ b/basicvalues.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "basic_values.hpp"
 
diff --git a/calendar_date.cpp b/calendar_date.cpp
index 76d6285..4bfac29 100644
--- a/calendar_date.cpp
+++ b/calendar_date.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "calendar_date.hpp"
 
diff --git a/calendar_date_test.cpp b/calendar_date_test.cpp
index 264c4f4..8b0c44e 100644
--- a/calendar_date_test.cpp
+++ b/calendar_date_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "calendar_date.hpp"
 
diff --git a/callback_test.cpp b/callback_test.cpp
index 09253a0..ace3de9 100644
--- a/callback_test.cpp
+++ b/callback_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "callback.hpp"
 
diff --git a/census_document.cpp b/census_document.cpp
index 3d3812c..a8625c5 100644
--- a/census_document.cpp
+++ b/census_document.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "census_document.hpp"
 #include "view_ex.tpp"
diff --git a/census_view.cpp b/census_view.cpp
index e8fa202..fa7db54 100644
--- a/census_view.cpp
+++ b/census_view.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "census_view.hpp"
 
diff --git a/comma_punct_test.cpp b/comma_punct_test.cpp
index 7849313..e28120f 100644
--- a/comma_punct_test.cpp
+++ b/comma_punct_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "comma_punct.hpp"
 
diff --git a/commutation_functions.cpp b/commutation_functions.cpp
index 2a36c43..5567006 100644
--- a/commutation_functions.cpp
+++ b/commutation_functions.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "commutation_functions.hpp"
 
diff --git a/commutation_functions_test.cpp b/commutation_functions_test.cpp
index fd68843..de30f4a 100644
--- a/commutation_functions_test.cpp
+++ b/commutation_functions_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "commutation_functions.hpp"
 
diff --git a/configurable_settings.cpp b/configurable_settings.cpp
index 42ccb9b..2cde230 100644
--- a/configurable_settings.cpp
+++ b/configurable_settings.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "configurable_settings.hpp"
 #include "xml_serializable.tpp"
diff --git a/configurable_settings.hpp b/configurable_settings.hpp
index 4ec0793..9d46c32 100644
--- a/configurable_settings.hpp
+++ b/configurable_settings.hpp
@@ -110,12 +110,12 @@ class LMI_SO configurable_settings
     bool        use_builtin_calculation_summary_;
     std::string xsl_fo_command_;
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 // COMPILER !! Borland compilers defectively [11/5] require a public dtor; see:
 // http://groups.google.com/groups?selm=7ei6fi%244me%241%40nnrp1.dejanews.com
 // 
http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&selm=m3k9fc25dj.fsf%40gabi-soft.fr
   public:
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
     ~configurable_settings();
 };
 
diff --git a/configurable_settings_test.cpp b/configurable_settings_test.cpp
index 83e0434..ddf302e 100644
--- a/configurable_settings_test.cpp
+++ b/configurable_settings_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "configurable_settings.hpp"
 
diff --git a/contains_test.cpp b/contains_test.cpp
index 7bc9b10..c0f93a3 100644
--- a/contains_test.cpp
+++ b/contains_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "contains.hpp"
 
diff --git a/cpp_main.cpp b/cpp_main.cpp
index 915f3e9..0e5f368 100644
--- a/cpp_main.cpp
+++ b/cpp_main.cpp
@@ -56,10 +56,10 @@
 // may elect to do so because header-only implementation requires no library
 // build support. (Suggested by Ed Brey)
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "catch_exceptions.hpp"
 #include "getopt.hpp"
diff --git a/crc32.cpp b/crc32.cpp
index e69944f..df331a9 100644
--- a/crc32.cpp
+++ b/crc32.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "crc32.hpp"
 
diff --git a/crc32_test.cpp b/crc32_test.cpp
index 4f37a39..da306f4 100644
--- a/crc32_test.cpp
+++ b/crc32_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "crc32.hpp"
 
diff --git a/custom_io_0.cpp b/custom_io_0.cpp
index f26d1b7..7b5fe99 100644
--- a/custom_io_0.cpp
+++ b/custom_io_0.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "custom_io_0.hpp"
 
diff --git a/custom_io_1.cpp b/custom_io_1.cpp
index 3f5838e..6e6d408 100644
--- a/custom_io_1.cpp
+++ b/custom_io_1.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "custom_io_1.hpp"
 
diff --git a/data_directory.cpp b/data_directory.cpp
index 2bf77c9..d8153e2 100644
--- a/data_directory.cpp
+++ b/data_directory.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "data_directory.hpp"
 
diff --git a/database.cpp b/database.cpp
index 74a78ba..a10963a 100644
--- a/database.cpp
+++ b/database.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "database.hpp"
 
diff --git a/database_view.cpp b/database_view.cpp
index a08da73..a4bb1f5 100644
--- a/database_view.cpp
+++ b/database_view.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "database_view.hpp"
 
diff --git a/datum_base.cpp b/datum_base.cpp
index 6e6df9b..7db3193 100644
--- a/datum_base.cpp
+++ b/datum_base.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "datum_base.hpp"
 
diff --git a/datum_boolean.cpp b/datum_boolean.cpp
index 86ac5f1..f661d60 100644
--- a/datum_boolean.cpp
+++ b/datum_boolean.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "datum_boolean.hpp"
 
diff --git a/datum_sequence.cpp b/datum_sequence.cpp
index d55a00f..456dc0f 100644
--- a/datum_sequence.cpp
+++ b/datum_sequence.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "datum_sequence.hpp"
 
diff --git a/datum_string.cpp b/datum_string.cpp
index f1822a3..f63dd53 100644
--- a/datum_string.cpp
+++ b/datum_string.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "datum_string.hpp"
 
diff --git a/dbdict.cpp b/dbdict.cpp
index 90d9cff..98fa259 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "dbdict.hpp"
 #include "xml_serializable.tpp"
diff --git a/dbnames.cpp b/dbnames.cpp
index aebbaf8..4a83690 100644
--- a/dbnames.cpp
+++ b/dbnames.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "dbnames.hpp"
 #include "dbnames.xpp"
diff --git a/dbvalue.cpp b/dbvalue.cpp
index 93d2b89..48168e8 100644
--- a/dbvalue.cpp
+++ b/dbvalue.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "dbvalue.hpp"
 
diff --git a/death_benefits.cpp b/death_benefits.cpp
index 61a3a5f..4fc74ef 100644
--- a/death_benefits.cpp
+++ b/death_benefits.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "death_benefits.hpp"
 
diff --git a/default_view.cpp b/default_view.cpp
index 3422088..0c4ece4 100644
--- a/default_view.cpp
+++ b/default_view.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "default_view.hpp"
 
diff --git a/docmanager_ex.cpp b/docmanager_ex.cpp
index 36a74f5..cee0221 100644
--- a/docmanager_ex.cpp
+++ b/docmanager_ex.cpp
@@ -32,10 +32,10 @@
 // and in the later years given in the copyright notice above as
 // detailed in ChangeLog.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "docmanager_ex.hpp"
 
diff --git a/emit_ledger.cpp b/emit_ledger.cpp
index 4fa6c3c..ca87ce1 100644
--- a/emit_ledger.cpp
+++ b/emit_ledger.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "emit_ledger.hpp"
 
diff --git a/expression_template_0_test.cpp b/expression_template_0_test.cpp
index 73aca07..f09f9dd 100644
--- a/expression_template_0_test.cpp
+++ b/expression_template_0_test.cpp
@@ -37,10 +37,10 @@
 #   define NDEBUG 1
 #endif // defined USE_UBLAS
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "et_vector.hpp"
 #include "materially_equal.hpp"
diff --git a/facets.cpp b/facets.cpp
index af8cc04..f7d81d0 100644
--- a/facets.cpp
+++ b/facets.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "facets.hpp"
 
diff --git a/fenv_guard.cpp b/fenv_guard.cpp
index 60c37a6..b18879d 100644
--- a/fenv_guard.cpp
+++ b/fenv_guard.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "fenv_guard.hpp"
 
diff --git a/fenv_lmi.cpp b/fenv_lmi.cpp
index aa84b05..8783183 100644
--- a/fenv_lmi.cpp
+++ b/fenv_lmi.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "fenv_lmi.hpp"
 
diff --git a/fenv_lmi_test.cpp b/fenv_lmi_test.cpp
index 6b4604e..2ea3f98 100644
--- a/fenv_lmi_test.cpp
+++ b/fenv_lmi_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 // Include this first, in order to get the prototype for nonstandard
 // _control87() before any other header can include <float.h>.
diff --git a/file_command.cpp b/file_command.cpp
index a881414..4dd5157 100644
--- a/file_command.cpp
+++ b/file_command.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "file_command.hpp"
 
diff --git a/file_command_cgi.cpp b/file_command_cgi.cpp
index 60f98f7..afd481d 100644
--- a/file_command_cgi.cpp
+++ b/file_command_cgi.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "file_command.hpp"
 
diff --git a/file_command_cli.cpp b/file_command_cli.cpp
index 082a3e5..9eba01c 100644
--- a/file_command_cli.cpp
+++ b/file_command_cli.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "file_command.hpp"
 
diff --git a/file_command_test.cpp b/file_command_test.cpp
index 7ba1fbb..f3189dc 100644
--- a/file_command_test.cpp
+++ b/file_command_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "file_command.hpp"
 
diff --git a/file_command_wx.cpp b/file_command_wx.cpp
index ce2ac69..2b36eb2 100644
--- a/file_command_wx.cpp
+++ b/file_command_wx.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "file_command.hpp"
 
diff --git a/financial_test.cpp b/financial_test.cpp
index 2d7a87a..f18085e 100644
--- a/financial_test.cpp
+++ b/financial_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "financial.hpp"
 
diff --git a/fund_data.cpp b/fund_data.cpp
index 5f5758e..795580b 100644
--- a/fund_data.cpp
+++ b/fund_data.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "fund_data.hpp"
 
diff --git a/generate_passkey.cpp b/generate_passkey.cpp
index 2564737..84340c3 100644
--- a/generate_passkey.cpp
+++ b/generate_passkey.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "authenticity.hpp"             // md5_hex_string()
 #include "main_common.hpp"
diff --git a/generate_product_files.cpp b/generate_product_files.cpp
index 859a28e..f2f6b91 100644
--- a/generate_product_files.cpp
+++ b/generate_product_files.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "dbdict.hpp"
 #include "fund_data.hpp"
diff --git a/getopt.cpp b/getopt.cpp
index 4e32573..6467f94 100644
--- a/getopt.cpp
+++ b/getopt.cpp
@@ -82,10 +82,10 @@
 // evidence here to support banning alloca() from this project.
 
 // GWC added this to conform to LMI standards.
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 // GWC changed filename to conform to LMI standard: lowercase, .hpp .
 // #include <GetOpt.h>
diff --git a/getopt_test.cpp b/getopt_test.cpp
index bc792f1..70478ae 100644
--- a/getopt_test.cpp
+++ b/getopt_test.cpp
@@ -37,10 +37,10 @@
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
 // GWC added this to conform to LMI standards.
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 // GWC changed filename to conform to LMI standard: lowercase, .hpp .
 // #include <GetOpt.h>
diff --git a/global_settings.cpp b/global_settings.cpp
index 1b3003e..6ed52ae 100644
--- a/global_settings.cpp
+++ b/global_settings.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "global_settings.hpp"
 
diff --git a/global_settings.hpp b/global_settings.hpp
index 236c09c..f2a44ca 100644
--- a/global_settings.hpp
+++ b/global_settings.hpp
@@ -100,12 +100,12 @@ class LMI_SO global_settings
     fs::path data_directory_;
     calendar_date prospicience_date_;
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 // COMPILER !! Borland compilers defectively [11/5] require a public dtor; see:
 // http://groups.google.com/groups?selm=7ei6fi%244me%241%40nnrp1.dejanews.com
 // 
http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&selm=m3k9fc25dj.fsf%40gabi-soft.fr
   public:
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
     ~global_settings();
 };
 
diff --git a/global_settings_test.cpp b/global_settings_test.cpp
index 11ec1dc..6ad9689 100644
--- a/global_settings_test.cpp
+++ b/global_settings_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "global_settings.hpp"
 
diff --git a/gpt_commutation_functions.cpp b/gpt_commutation_functions.cpp
index 146a2cd..a02ee71 100644
--- a/gpt_commutation_functions.cpp
+++ b/gpt_commutation_functions.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "gpt_commutation_functions.hpp"
 
diff --git a/gpt_document.cpp b/gpt_document.cpp
index 48199ab..3f0b154 100644
--- a/gpt_document.cpp
+++ b/gpt_document.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "gpt_document.hpp"
 #include "view_ex.tpp"
diff --git a/gpt_input.cpp b/gpt_input.cpp
index 5c39767..84c23a4 100644
--- a/gpt_input.cpp
+++ b/gpt_input.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "gpt_input.hpp"
 #include "xml_serializable.tpp"
diff --git a/gpt_server.cpp b/gpt_server.cpp
index 5364eb8..ab9697f 100644
--- a/gpt_server.cpp
+++ b/gpt_server.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "gpt_server.hpp"
 
diff --git a/gpt_specamt.cpp b/gpt_specamt.cpp
index bf214d2..33a89c8 100644
--- a/gpt_specamt.cpp
+++ b/gpt_specamt.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "gpt_specamt.hpp"
 
diff --git a/gpt_state.cpp b/gpt_state.cpp
index 71ffab6..a924fa8 100644
--- a/gpt_state.cpp
+++ b/gpt_state.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "gpt_state.hpp"
 #include "xml_serializable.tpp"
diff --git a/gpt_test.cpp b/gpt_test.cpp
index b859aa9..6e950c6 100644
--- a/gpt_test.cpp
+++ b/gpt_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "gpt_commutation_functions.hpp"
 #include "ihs_irc7702.hpp"
diff --git a/gpt_view.cpp b/gpt_view.cpp
index 80f40a9..a4e8760 100644
--- a/gpt_view.cpp
+++ b/gpt_view.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "gpt_view.hpp"
 
diff --git a/gpt_xml_document.cpp b/gpt_xml_document.cpp
index 9a58072..e96023f 100644
--- a/gpt_xml_document.cpp
+++ b/gpt_xml_document.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "gpt_xml_document.hpp"
 
diff --git a/group_quote_pdf_gen.cpp b/group_quote_pdf_gen.cpp
index 6ab8e9f..3ab46b0 100644
--- a/group_quote_pdf_gen.cpp
+++ b/group_quote_pdf_gen.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "group_quote_pdf_gen.hpp"
 
diff --git a/group_quote_pdf_gen_wx.cpp b/group_quote_pdf_gen_wx.cpp
index e923e6d..79d6772 100644
--- a/group_quote_pdf_gen_wx.cpp
+++ b/group_quote_pdf_gen_wx.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "group_quote_pdf_gen.hpp"
 
diff --git a/group_values.cpp b/group_values.cpp
index 61279d8..5f03f79 100644
--- a/group_values.cpp
+++ b/group_values.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "group_values.hpp"
 
diff --git a/handle_exceptions_test.cpp b/handle_exceptions_test.cpp
index fe07fc8..1c2e0ec 100644
--- a/handle_exceptions_test.cpp
+++ b/handle_exceptions_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "handle_exceptions.hpp"
 
diff --git a/icon_monger.cpp b/icon_monger.cpp
index 28a155a..a2281a2 100644
--- a/icon_monger.cpp
+++ b/icon_monger.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "icon_monger.hpp"
 
diff --git a/ieee754_test.cpp b/ieee754_test.cpp
index 76e97b5..6acd90b 100644
--- a/ieee754_test.cpp
+++ b/ieee754_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "ieee754.hpp"
 
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 21777e7..1added8 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "account_value.hpp"
 
diff --git a/ihs_avdebug.cpp b/ihs_avdebug.cpp
index 59c4ba8..5b0c512 100644
--- a/ihs_avdebug.cpp
+++ b/ihs_avdebug.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "account_value.hpp"
 
diff --git a/ihs_avmly.cpp b/ihs_avmly.cpp
index 4021d13..ae168c8 100644
--- a/ihs_avmly.cpp
+++ b/ihs_avmly.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "account_value.hpp"
 
diff --git a/ihs_avsolve.cpp b/ihs_avsolve.cpp
index aa0f19f..8840086 100644
--- a/ihs_avsolve.cpp
+++ b/ihs_avsolve.cpp
@@ -26,10 +26,10 @@
 // is as good as any algorithm's, and its worst-case performance
 // is better than any algorithm's except Bolzano's.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "account_value.hpp"
 
diff --git a/ihs_avstrtgy.cpp b/ihs_avstrtgy.cpp
index 20a3742..b7b0bed 100644
--- a/ihs_avstrtgy.cpp
+++ b/ihs_avstrtgy.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "account_value.hpp"
 
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index 6c06410..b1ad92e 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "basic_values.hpp"
 
diff --git a/ihs_irc7702.cpp b/ihs_irc7702.cpp
index fdcf0b0..7cf2e8e 100644
--- a/ihs_irc7702.cpp
+++ b/ihs_irc7702.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "ihs_irc7702.hpp"
 
diff --git a/ihs_irc7702a.cpp b/ihs_irc7702a.cpp
index 8d7ebb6..d08e423 100644
--- a/ihs_irc7702a.cpp
+++ b/ihs_irc7702a.cpp
@@ -25,10 +25,10 @@
 
 // TODO ?? TAXATION !! Treat ROP increases as material changes exactly where 
needed.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "ihs_irc7702a.hpp"
 
diff --git a/ihs_mortal.cpp b/ihs_mortal.cpp
index dc226a5..69c67fe 100644
--- a/ihs_mortal.cpp
+++ b/ihs_mortal.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mortality_rates.hpp"
 
diff --git a/ihs_server7702.cpp b/ihs_server7702.cpp
index 21b2bce..7f0eee4 100644
--- a/ihs_server7702.cpp
+++ b/ihs_server7702.cpp
@@ -22,10 +22,10 @@
 // Known defects:
 // grep for "NEED DECISION"
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "ihs_server7702.hpp"
 
diff --git a/illustration_document.cpp b/illustration_document.cpp
index 4913e7b..5468f0f 100644
--- a/illustration_document.cpp
+++ b/illustration_document.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "illustration_document.hpp"
 #include "view_ex.tpp"
diff --git a/illustration_view.cpp b/illustration_view.cpp
index 515a610..d6da50a 100644
--- a/illustration_view.cpp
+++ b/illustration_view.cpp
@@ -29,10 +29,10 @@
 // view class customized for illustration documents, and in the later
 // years given in the copyright notice above.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "illustration_view.hpp"
 
diff --git a/illustrator.cpp b/illustrator.cpp
index 9d74394..f8677c2 100644
--- a/illustrator.cpp
+++ b/illustrator.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "illustrator.hpp"
 
diff --git a/input.cpp b/input.cpp
index ceae778..751bc1a 100644
--- a/input.cpp
+++ b/input.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "input.hpp"
 
diff --git a/input_harmonization.cpp b/input_harmonization.cpp
index eddecd3..d8f821d 100644
--- a/input_harmonization.cpp
+++ b/input_harmonization.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "input.hpp"
 
diff --git a/input_realization.cpp b/input_realization.cpp
index 72d7487..b8d074d 100644
--- a/input_realization.cpp
+++ b/input_realization.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "input.hpp"
 
diff --git a/input_seq_helpers.cpp b/input_seq_helpers.cpp
index 8c6dade..f411ed7 100644
--- a/input_seq_helpers.cpp
+++ b/input_seq_helpers.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "input_seq_helpers.hpp"
 
diff --git a/input_seq_test.cpp b/input_seq_test.cpp
index 64ccea2..198c8d0 100644
--- a/input_seq_test.cpp
+++ b/input_seq_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "input_sequence.hpp"
 
diff --git a/input_sequence.cpp b/input_sequence.cpp
index 8369bac..4ea7d91 100644
--- a/input_sequence.cpp
+++ b/input_sequence.cpp
@@ -20,10 +20,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "input_sequence.hpp"
 
diff --git a/input_sequence_entry.cpp b/input_sequence_entry.cpp
index c30f08a..8eb5cf5 100644
--- a/input_sequence_entry.cpp
+++ b/input_sequence_entry.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "input_sequence_entry.hpp"
 
diff --git a/input_test.cpp b/input_test.cpp
index c8ce8ae..4519150 100644
--- a/input_test.cpp
+++ b/input_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 // Facilities offered by all of these headers are tested here.
 // Class product_database might appear not to belong, but it's
diff --git a/input_xml_io.cpp b/input_xml_io.cpp
index a050644..555c0df 100644
--- a/input_xml_io.cpp
+++ b/input_xml_io.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "input.hpp"
 #include "xml_serializable.tpp"
diff --git a/interest_rates.cpp b/interest_rates.cpp
index 00cb2da..2a5130f 100644
--- a/interest_rates.cpp
+++ b/interest_rates.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "interest_rates.hpp"
 
diff --git a/irc7702a_test.cpp b/irc7702a_test.cpp
index ee62a8b..af43b47 100644
--- a/irc7702a_test.cpp
+++ b/irc7702a_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "ihs_irc7702a.hpp"
 
diff --git a/istream_to_string_test.cpp b/istream_to_string_test.cpp
index 3a709da..879c5af 100644
--- a/istream_to_string_test.cpp
+++ b/istream_to_string_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "istream_to_string.hpp"
 
diff --git a/ledger.cpp b/ledger.cpp
index 20d88b6..632ce97 100644
--- a/ledger.cpp
+++ b/ledger.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "ledger.hpp"
 
diff --git a/ledger_base.cpp b/ledger_base.cpp
index 69ed4b2..e766c7c 100644
--- a/ledger_base.cpp
+++ b/ledger_base.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "ledger_base.hpp"
 
diff --git a/ledger_invariant.cpp b/ledger_invariant.cpp
index 302e8b5..93f5f39 100644
--- a/ledger_invariant.cpp
+++ b/ledger_invariant.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "ledger_invariant.hpp"
 
diff --git a/ledger_text_formats.cpp b/ledger_text_formats.cpp
index 1fd8bb7..35d5f7b 100644
--- a/ledger_text_formats.cpp
+++ b/ledger_text_formats.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "ledger_text_formats.hpp"
 
diff --git a/ledger_variant.cpp b/ledger_variant.cpp
index e67a9a1..3623212 100644
--- a/ledger_variant.cpp
+++ b/ledger_variant.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "ledger_variant.hpp"
 
diff --git a/ledger_xsl.cpp b/ledger_xsl.cpp
index f234d71..7cc1855 100644
--- a/ledger_xsl.cpp
+++ b/ledger_xsl.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "ledger_xsl.hpp"
 
diff --git a/ledgervalues.cpp b/ledgervalues.cpp
index 45105c4..c13e2f9 100644
--- a/ledgervalues.cpp
+++ b/ledgervalues.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "ledgervalues.hpp"
 
diff --git a/license.cpp b/license.cpp
index de6bbe5..4105085 100644
--- a/license.cpp
+++ b/license.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "license.hpp"
 
diff --git a/lmi.cpp b/lmi.cpp
index 41bba3e..3b2e3fa 100644
--- a/lmi.cpp
+++ b/lmi.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "lmi.hpp"
 
diff --git a/loads.cpp b/loads.cpp
index c75096e..9acc6a8 100644
--- a/loads.cpp
+++ b/loads.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "loads.hpp"
 #include "loads_impl.hpp"
diff --git a/loads_test.cpp b/loads_test.cpp
index 54a069c..6aa037c 100644
--- a/loads_test.cpp
+++ b/loads_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "loads.hpp"
 #include "loads_impl.hpp"
diff --git a/main_cgi.cpp b/main_cgi.cpp
index 3789e86..c7dd4cd 100644
--- a/main_cgi.cpp
+++ b/main_cgi.cpp
@@ -31,10 +31,10 @@
 // other reasons evident in the repository or explained in 'ChangeLog'.
 // Any defect should not reflect on Stephen F. Booth's reputation.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "alert.hpp"
 #include "configurable_settings.hpp"
diff --git a/main_cli.cpp b/main_cli.cpp
index 75688d0..e0ce2ee 100644
--- a/main_cli.cpp
+++ b/main_cli.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "alert.hpp"
 #include "assert_lmi.hpp"
diff --git a/main_common.cpp b/main_common.cpp
index 0f5125e..f5f43f2 100644
--- a/main_common.cpp
+++ b/main_common.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "main_common.hpp"
 
diff --git a/main_common_non_wx.cpp b/main_common_non_wx.cpp
index 4de5a00..fb284eb 100644
--- a/main_common_non_wx.cpp
+++ b/main_common_non_wx.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "main_common.hpp"
 
diff --git a/main_wx.cpp b/main_wx.cpp
index dc2f5a0..daf1783 100644
--- a/main_wx.cpp
+++ b/main_wx.cpp
@@ -29,10 +29,10 @@
 // implementation, modifying it in 2002 and the later years given in
 // the copyright notice above.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "alert.hpp"                    // safely_show_message()
 #include "fenv_lmi.hpp"
diff --git a/main_wx_test.cpp b/main_wx_test.cpp
index 275542f..076242a 100644
--- a/main_wx_test.cpp
+++ b/main_wx_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "alert.hpp"
 #include "assert_lmi.hpp"
diff --git a/map_lookup_test.cpp b/map_lookup_test.cpp
index 9bfa04a..b8037b0 100644
--- a/map_lookup_test.cpp
+++ b/map_lookup_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "map_lookup.hpp"
 
diff --git a/materially_equal_test.cpp b/materially_equal_test.cpp
index e54e0c7..4f1ab28 100644
--- a/materially_equal_test.cpp
+++ b/materially_equal_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "materially_equal.hpp"
 
diff --git a/math_functors_test.cpp b/math_functors_test.cpp
index 6d2e63b..6fd7d40 100644
--- a/math_functors_test.cpp
+++ b/math_functors_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "math_functors.hpp"
 
diff --git a/mc_enum.cpp b/mc_enum.cpp
index f22139a..be49740 100644
--- a/mc_enum.cpp
+++ b/mc_enum.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mc_enum.hpp"
 
diff --git a/mc_enum_test.cpp b/mc_enum_test.cpp
index 73ca30d..264cf91 100644
--- a/mc_enum_test.cpp
+++ b/mc_enum_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "ce_product_name.hpp"
 #include "mc_enum.hpp"
diff --git a/mc_enum_test_aux.cpp b/mc_enum_test_aux.cpp
index 86833da..24caa14 100644
--- a/mc_enum_test_aux.cpp
+++ b/mc_enum_test_aux.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mc_enum.tpp"
 #include "mc_enum_test_aux.hpp"
diff --git a/mc_enum_types.cpp b/mc_enum_types.cpp
index 41bc423..cd864b5 100644
--- a/mc_enum_types.cpp
+++ b/mc_enum_types.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mc_enum.tpp"
 #include "mc_enum_types.hpp"
diff --git a/mc_enum_types_aux.cpp b/mc_enum_types_aux.cpp
index d103195..b2edea7 100644
--- a/mc_enum_types_aux.cpp
+++ b/mc_enum_types_aux.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mc_enum_types_aux.hpp"
 
diff --git a/mec_document.cpp b/mec_document.cpp
index 39574b4..99d10b2 100644
--- a/mec_document.cpp
+++ b/mec_document.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "mec_document.hpp"
 #include "view_ex.tpp"
diff --git a/mec_input.cpp b/mec_input.cpp
index cf01a7f..7be3646 100644
--- a/mec_input.cpp
+++ b/mec_input.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mec_input.hpp"
 #include "xml_serializable.tpp"
diff --git a/mec_server.cpp b/mec_server.cpp
index c48da94..47c71ea 100644
--- a/mec_server.cpp
+++ b/mec_server.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mec_server.hpp"
 
diff --git a/mec_state.cpp b/mec_state.cpp
index 72c3406..6053ee7 100644
--- a/mec_state.cpp
+++ b/mec_state.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mec_state.hpp"
 #include "xml_serializable.tpp"
diff --git a/mec_view.cpp b/mec_view.cpp
index d2f784f..827a4b2 100644
--- a/mec_view.cpp
+++ b/mec_view.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mec_view.hpp"
 
diff --git a/mec_xml_document.cpp b/mec_xml_document.cpp
index 778dd56..a351aec 100644
--- a/mec_xml_document.cpp
+++ b/mec_xml_document.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mec_xml_document.hpp"
 
diff --git a/miscellany.cpp b/miscellany.cpp
index 0097632..571a507 100644
--- a/miscellany.cpp
+++ b/miscellany.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "miscellany.hpp"
 
diff --git a/miscellany_test.cpp b/miscellany_test.cpp
index fb4e3e1..6c6589f 100644
--- a/miscellany_test.cpp
+++ b/miscellany_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "miscellany.hpp"
 
diff --git a/mortality_rates.cpp b/mortality_rates.cpp
index 8734444..2ce2b92 100644
--- a/mortality_rates.cpp
+++ b/mortality_rates.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mortality_rates.hpp"
 
diff --git a/mortality_rates_fetch.cpp b/mortality_rates_fetch.cpp
index b417300..dc6dbb5 100644
--- a/mortality_rates_fetch.cpp
+++ b/mortality_rates_fetch.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mortality_rates.hpp"
 
diff --git a/mortality_rates_test.cpp b/mortality_rates_test.cpp
index 098f0f4..7b45e99 100644
--- a/mortality_rates_test.cpp
+++ b/mortality_rates_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mortality_rates.hpp"
 
diff --git a/msw_workarounds.cpp b/msw_workarounds.cpp
index ce22b6e..311791e 100644
--- a/msw_workarounds.cpp
+++ b/msw_workarounds.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "msw_workarounds.hpp"
 
diff --git a/multidimgrid_any.cpp b/multidimgrid_any.cpp
index ac674df..96cf184 100644
--- a/multidimgrid_any.cpp
+++ b/multidimgrid_any.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "multidimgrid_any.hpp"
 
diff --git a/multiple_cell_document.cpp b/multiple_cell_document.cpp
index 290a9eb..adba6cf 100644
--- a/multiple_cell_document.cpp
+++ b/multiple_cell_document.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "multiple_cell_document.hpp"
 
diff --git a/mvc_controller.cpp b/mvc_controller.cpp
index 9dde536..96c2eb0 100644
--- a/mvc_controller.cpp
+++ b/mvc_controller.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mvc_controller.hpp"
 #include "mvc_controller.tpp"
diff --git a/mvc_model.cpp b/mvc_model.cpp
index 955ef39..5a6e3b0 100644
--- a/mvc_model.cpp
+++ b/mvc_model.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mvc_model.hpp"
 
diff --git a/mvc_view.cpp b/mvc_view.cpp
index edd96cf..8380cdf 100644
--- a/mvc_view.cpp
+++ b/mvc_view.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "mvc_view.hpp"
 
diff --git a/my_db.cpp b/my_db.cpp
index 46109e2..d3a4163 100644
--- a/my_db.cpp
+++ b/my_db.cpp
@@ -32,10 +32,10 @@
 // Those files are all you need: distributing the program itself isn't
 // necessary anyway.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "dbdict.hpp"
 
diff --git a/my_fund.cpp b/my_fund.cpp
index 8a9712a..79f8176 100644
--- a/my_fund.cpp
+++ b/my_fund.cpp
@@ -32,10 +32,10 @@
 // Those files are all you need: distributing the program itself isn't
 // necessary anyway.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "fund_data.hpp"
 
diff --git a/my_prod.cpp b/my_prod.cpp
index e1b9061..8af90c9 100644
--- a/my_prod.cpp
+++ b/my_prod.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "product_data.hpp"
 
diff --git a/my_proem.cpp b/my_proem.cpp
index 98fa462..c857551 100644
--- a/my_proem.cpp
+++ b/my_proem.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "my_proem.hpp"
 
diff --git a/my_rnd.cpp b/my_rnd.cpp
index 8b9d5b8..9b134b2 100644
--- a/my_rnd.cpp
+++ b/my_rnd.cpp
@@ -32,10 +32,10 @@
 // Those files are all you need: distributing the program itself isn't
 // necessary anyway.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "rounding_rules.hpp"
 
diff --git a/my_test_coding_rules.cpp b/my_test_coding_rules.cpp
index 1dbd8d0..6eaee19 100644
--- a/my_test_coding_rules.cpp
+++ b/my_test_coding_rules.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include <map>
 #include <string>
diff --git a/my_tier.cpp b/my_tier.cpp
index 1c6baaa..b1605ab 100644
--- a/my_tier.cpp
+++ b/my_tier.cpp
@@ -32,10 +32,10 @@
 // Those files are all you need: distributing the program itself isn't
 // necessary anyway.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "stratified_charges.hpp"
 
diff --git a/name_value_pairs.cpp b/name_value_pairs.cpp
index a4c8a5c..9c414c0 100644
--- a/name_value_pairs.cpp
+++ b/name_value_pairs.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "name_value_pairs.hpp"
 
diff --git a/name_value_pairs_test.cpp b/name_value_pairs_test.cpp
index c1f70bf..a9a63cb 100644
--- a/name_value_pairs_test.cpp
+++ b/name_value_pairs_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "name_value_pairs.hpp"
 
diff --git a/ncnnnpnn_test.cpp b/ncnnnpnn_test.cpp
index 1c2a2b4..7935f04 100644
--- a/ncnnnpnn_test.cpp
+++ b/ncnnnpnn_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "ncnnnpnn.hpp"
 
@@ -32,7 +32,7 @@
 
 #if defined __BORLANDC__
 #   include <float.h>                   // nonstandard _control87()
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 int test_main(int, char*[])
 {
@@ -134,7 +134,7 @@ int test_main(int, char*[])
     // and signals a hardware exception; but we want to test them,
     // so we mask them from the application.
     _control87(0x00ff,  0x00ff);
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
     volatile long double d = 0.0;
     ncnnnpnn( 1.0 / d  );
diff --git a/null_stream.cpp b/null_stream.cpp
index ba2dee4..fa73379 100644
--- a/null_stream.cpp
+++ b/null_stream.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "null_stream.hpp"
 #include "uncopyable_lmi.hpp"
diff --git a/numeric_io_cast.hpp b/numeric_io_cast.hpp
index 6f7e11e..2a4e684 100644
--- a/numeric_io_cast.hpp
+++ b/numeric_io_cast.hpp
@@ -218,7 +218,7 @@ struct numeric_converter<To, char const*>
         }
 };
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 // COMPILER !! The borland compiler fails to ignore top-level
 // cv-qualifiers as 14.8.2/1 requires. Reference:
 //   http://groups.google.com/address@hidden
@@ -332,7 +332,7 @@ struct numeric_converter<std::string, std::string>
         }
 };
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 // COMPILER !! The borland compiler needs this to convert from a
 // string literal. It seems to type such constants as [non-const]
 // char*, ignoring 4.2/2 .
@@ -347,7 +347,7 @@ struct numeric_converter<std::string, char*>
         return from;
         }
 };
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 template<>
 struct numeric_converter<std::string, char const*>
diff --git a/numeric_io_test.cpp b/numeric_io_test.cpp
index b6097be..518ccac 100644
--- a/numeric_io_test.cpp
+++ b/numeric_io_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "numeric_io_cast.hpp"
 
diff --git a/obstruct_slicing_test.cpp b/obstruct_slicing_test.cpp
index 92d08b1..d975abf 100644
--- a/obstruct_slicing_test.cpp
+++ b/obstruct_slicing_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "obstruct_slicing.hpp"
 
diff --git a/outlay.cpp b/outlay.cpp
index ab0c82f..99e62f6 100644
--- a/outlay.cpp
+++ b/outlay.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "outlay.hpp"
 
diff --git a/path_utility.cpp b/path_utility.cpp
index 1a50862..ed4060f 100644
--- a/path_utility.cpp
+++ b/path_utility.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "path_utility.hpp"
 
diff --git a/path_utility_test.cpp b/path_utility_test.cpp
index f1e011a..f5f308f 100644
--- a/path_utility_test.cpp
+++ b/path_utility_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "path_utility.hpp"
 
diff --git a/policy_document.cpp b/policy_document.cpp
index 4514684..ee524a4 100644
--- a/policy_document.cpp
+++ b/policy_document.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "policy_document.hpp"
 
diff --git a/policy_view.cpp b/policy_view.cpp
index 27cb4c1..ee756c4 100644
--- a/policy_view.cpp
+++ b/policy_view.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "policy_view.hpp"
 
diff --git a/preferences_model.cpp b/preferences_model.cpp
index 034b545..00c52c8 100644
--- a/preferences_model.cpp
+++ b/preferences_model.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "preferences_model.hpp"
 
diff --git a/preferences_view.cpp b/preferences_view.cpp
index 0c1b891..3f246ea 100644
--- a/preferences_view.cpp
+++ b/preferences_view.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "preferences_view.hpp"
 
diff --git a/premium_tax.cpp b/premium_tax.cpp
index e3cccd7..03ee276 100644
--- a/premium_tax.cpp
+++ b/premium_tax.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "premium_tax.hpp"
 
diff --git a/premium_tax_test.cpp b/premium_tax_test.cpp
index d25cf22..a2107e2 100644
--- a/premium_tax_test.cpp
+++ b/premium_tax_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "premium_tax.hpp"
 
diff --git a/previewframe_ex.cpp b/previewframe_ex.cpp
index 39b5712..d1ca656 100644
--- a/previewframe_ex.cpp
+++ b/previewframe_ex.cpp
@@ -27,10 +27,10 @@
 //   while preview is active, application hidden as well as disabled
 // and in the later years given in the copyright notice above.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "previewframe_ex.hpp"
 
diff --git a/print_matrix_test.cpp b/print_matrix_test.cpp
index fbacc8e..e28df3f 100644
--- a/print_matrix_test.cpp
+++ b/print_matrix_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "print_matrix.hpp"
 
diff --git a/product_data.cpp b/product_data.cpp
index 13d913a..0f92bf2 100644
--- a/product_data.cpp
+++ b/product_data.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "product_data.hpp"
 #include "xml_serializable.tpp"
diff --git a/product_file_test.cpp b/product_file_test.cpp
index 799515a..70e771a 100644
--- a/product_file_test.cpp
+++ b/product_file_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "dbdict.hpp"
 #include "fund_data.hpp"
diff --git a/progress_meter.cpp b/progress_meter.cpp
index da694a2..b6e0df1 100644
--- a/progress_meter.cpp
+++ b/progress_meter.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "progress_meter.hpp"
 
diff --git a/progress_meter_cgi.cpp b/progress_meter_cgi.cpp
index 3ae1195..3d900bb 100644
--- a/progress_meter_cgi.cpp
+++ b/progress_meter_cgi.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "progress_meter.hpp"
 
diff --git a/progress_meter_cli.cpp b/progress_meter_cli.cpp
index da4d71d..d6e92c4 100644
--- a/progress_meter_cli.cpp
+++ b/progress_meter_cli.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "progress_meter.hpp"
 
diff --git a/progress_meter_test.cpp b/progress_meter_test.cpp
index fa13b36..681f6ab 100644
--- a/progress_meter_test.cpp
+++ b/progress_meter_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "progress_meter.hpp"
 
diff --git a/progress_meter_wx.cpp b/progress_meter_wx.cpp
index ac0b533..f5878e6 100644
--- a/progress_meter_wx.cpp
+++ b/progress_meter_wx.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "progress_meter.hpp"
 
diff --git a/rate_table.cpp b/rate_table.cpp
index 6e646f1..60da837 100644
--- a/rate_table.cpp
+++ b/rate_table.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "rate_table.hpp"
 
diff --git a/rate_table_test.cpp b/rate_table_test.cpp
index 9c9a4a7..9b8b337 100644
--- a/rate_table_test.cpp
+++ b/rate_table_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "rate_table.hpp"
 
diff --git a/rate_table_tool.cpp b/rate_table_tool.cpp
index 52abf92..761b642 100644
--- a/rate_table_tool.cpp
+++ b/rate_table_tool.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "alert.hpp"
 #include "getopt.hpp"
diff --git a/regex_test.cpp b/regex_test.cpp
index b6e34b2..7ba4fdc 100644
--- a/regex_test.cpp
+++ b/regex_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "contains.hpp"
 #include "test_tools.hpp"
diff --git a/round_test.cpp b/round_test.cpp
index 62df998..3c309e3 100644
--- a/round_test.cpp
+++ b/round_test.cpp
@@ -30,10 +30,10 @@
 // Functions [ll,l]round[f,,l]() are not explicitly tested, though
 // they ideally ought to be.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "round_to.hpp"
 
diff --git a/round_to_test.cpp b/round_to_test.cpp
index 9e59c86..1c1bf8e 100644
--- a/round_to_test.cpp
+++ b/round_to_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "round_to.hpp"
 
diff --git a/rounding_rules.cpp b/rounding_rules.cpp
index 10f1db3..ae5ccb8 100644
--- a/rounding_rules.cpp
+++ b/rounding_rules.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "rounding_rules.hpp"
 #include "xml_serializable.tpp"
diff --git a/rounding_view.cpp b/rounding_view.cpp
index b332365..c7477f7 100644
--- a/rounding_view.cpp
+++ b/rounding_view.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "rounding_view.hpp"
 
diff --git a/rtti_lmi_test.cpp b/rtti_lmi_test.cpp
index de05399..5c7c2b8 100644
--- a/rtti_lmi_test.cpp
+++ b/rtti_lmi_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "rtti_lmi.hpp"
 
diff --git a/safely_dereference_as_test.cpp b/safely_dereference_as_test.cpp
index 02c1d98..a7a5f70 100644
--- a/safely_dereference_as_test.cpp
+++ b/safely_dereference_as_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "safely_dereference_as.hpp"
 
diff --git a/sandbox_test.cpp b/sandbox_test.cpp
index 3717ff7..10defca 100644
--- a/sandbox_test.cpp
+++ b/sandbox_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "test_tools.hpp"
 
diff --git a/sigfpe.cpp b/sigfpe.cpp
index d9db3aa..50ae46a 100644
--- a/sigfpe.cpp
+++ b/sigfpe.cpp
@@ -29,10 +29,10 @@
 // to work. This file is retained because it might be useful on other
 // platforms (on which it hasn't been tested).
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "sigfpe.hpp"
 
diff --git a/single_cell_document.cpp b/single_cell_document.cpp
index f4f05fa..32627a7 100644
--- a/single_cell_document.cpp
+++ b/single_cell_document.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "single_cell_document.hpp"
 
diff --git a/single_choice_popup_menu.cpp b/single_choice_popup_menu.cpp
index cf35023..1debb7c 100644
--- a/single_choice_popup_menu.cpp
+++ b/single_choice_popup_menu.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "single_choice_popup_menu.hpp"
 
diff --git a/skeleton.cpp b/skeleton.cpp
index 9fc9ee6..95fc78b 100644
--- a/skeleton.cpp
+++ b/skeleton.cpp
@@ -29,10 +29,10 @@
 // implementation, modifying it in 2002 and the later years given in
 // the copyright notice above.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "skeleton.hpp"
 
diff --git a/snprintf_test.cpp b/snprintf_test.cpp
index 0edcafd..85105b6 100644
--- a/snprintf_test.cpp
+++ b/snprintf_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "test_tools.hpp"
 
diff --git a/soa2xml.cpp b/soa2xml.cpp
index 8aef744..eff5646 100644
--- a/soa2xml.cpp
+++ b/soa2xml.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "actuarial_table.hpp"
 #include "soa_helpers.hpp"
diff --git a/soa_stress_test.cpp b/soa_stress_test.cpp
index 3e9926b..ea4950d 100644
--- a/soa_stress_test.cpp
+++ b/soa_stress_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "actuarial_table.hpp"
 #include "assert_lmi.hpp"
diff --git a/solve.cpp b/solve.cpp
index 6f308ae..7d6984c 100644
--- a/solve.cpp
+++ b/solve.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "account_value.hpp"
 
diff --git a/stratified_algorithms.cpp b/stratified_algorithms.cpp
index 3c28130..f3b867f 100644
--- a/stratified_algorithms.cpp
+++ b/stratified_algorithms.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "stratified_algorithms.hpp"
 
diff --git a/stratified_algorithms_test.cpp b/stratified_algorithms_test.cpp
index 7b68ec7..2be27c5 100644
--- a/stratified_algorithms_test.cpp
+++ b/stratified_algorithms_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "stratified_algorithms.hpp"
 
diff --git a/stratified_charges.cpp b/stratified_charges.cpp
index c0908b9..87fcdf3 100644
--- a/stratified_charges.cpp
+++ b/stratified_charges.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "stratified_charges.hpp"
 #include "xml_serializable.tpp"
diff --git a/stream_cast_test.cpp b/stream_cast_test.cpp
index 2d732f2..ab01602 100644
--- a/stream_cast_test.cpp
+++ b/stream_cast_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "stream_cast.hpp"
 
diff --git a/surrchg_rates.cpp b/surrchg_rates.cpp
index 743a26f..8ac50d4 100644
--- a/surrchg_rates.cpp
+++ b/surrchg_rates.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "surrchg_rates.hpp"
 
diff --git a/system_command.cpp b/system_command.cpp
index 013ec5b..66ecc26 100644
--- a/system_command.cpp
+++ b/system_command.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "system_command.hpp"
 
diff --git a/system_command_non_wx.cpp b/system_command_non_wx.cpp
index 8dbf471..2da3192 100644
--- a/system_command_non_wx.cpp
+++ b/system_command_non_wx.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "system_command.hpp"
 
diff --git a/system_command_test.cpp b/system_command_test.cpp
index a643cb3..7aa4068 100644
--- a/system_command_test.cpp
+++ b/system_command_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "system_command.hpp"
 
diff --git a/system_command_wx.cpp b/system_command_wx.cpp
index b67b762..873ebbb 100644
--- a/system_command_wx.cpp
+++ b/system_command_wx.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "system_command.hpp"
 
diff --git a/test_coding_rules.cpp b/test_coding_rules.cpp
index f2397e6..bea2680 100644
--- a/test_coding_rules.cpp
+++ b/test_coding_rules.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "contains.hpp"
diff --git a/test_main.cpp b/test_main.cpp
index f4bdc07..50c2174 100644
--- a/test_main.cpp
+++ b/test_main.cpp
@@ -56,10 +56,10 @@
 // may elect to do so because header-only implementation requires no library
 // build support. (Suggested by Ed Brey)
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "exit_codes.hpp"
 #include "fenv_lmi.hpp"
diff --git a/test_tools_test.cpp b/test_tools_test.cpp
index 3360e8f..bb5f6de 100644
--- a/test_tools_test.cpp
+++ b/test_tools_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "test_tools.hpp"
 
diff --git a/text_doc.cpp b/text_doc.cpp
index 24e7da6..1c3f24b 100644
--- a/text_doc.cpp
+++ b/text_doc.cpp
@@ -27,10 +27,10 @@
 // class out of a larger file, and in the later years given in the
 // copyright notice above.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "text_doc.hpp"
 #include "view_ex.tpp"
diff --git a/text_view.cpp b/text_view.cpp
index b608471..2bfd4ec 100644
--- a/text_view.cpp
+++ b/text_view.cpp
@@ -27,10 +27,10 @@
 // class out of a larger file, and in the later years given in the
 // copyright notice above.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "text_view.hpp"
 
diff --git a/tier_document.cpp b/tier_document.cpp
index b9bfc4b..a1ae33b 100644
--- a/tier_document.cpp
+++ b/tier_document.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "tier_document.hpp"
 
diff --git a/tier_view.cpp b/tier_view.cpp
index 7a20f31..5d72e68 100644
--- a/tier_view.cpp
+++ b/tier_view.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "tier_view.hpp"
 
diff --git a/timer.cpp b/timer.cpp
index 3d2160f..434fee8 100644
--- a/timer.cpp
+++ b/timer.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "timer.hpp"
 
diff --git a/timer_test.cpp b/timer_test.cpp
index 55caa0c..9c86034 100644
--- a/timer_test.cpp
+++ b/timer_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "timer.hpp"
 
diff --git a/tn_range_test.cpp b/tn_range_test.cpp
index b9ecdcb..0bf37db 100644
--- a/tn_range_test.cpp
+++ b/tn_range_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "tn_range.hpp"
 #include "tn_range.tpp"                 // Class template implementation.
@@ -233,12 +233,12 @@ void tn_range_test::test_percentages(char const* file, 
int line)
 {
     // These workarounds for negative one permit running these tests
     // with unsigned percentage types, and avoid compiler warnings.
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
     // COMPILER !! This definition somehow makes borland happy. See
     //  
http://groups.google.com/groups?selm=4196a049%241%40newsgroups.borland.com
     T::number_type work_around_borland_defect;
     &work_around_borland_defect;
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
     typedef typename T::number_type N;
     // Use this to test whether -1 is valid.
     N n1 = static_cast<N>(-1);
diff --git a/tn_range_test_aux.cpp b/tn_range_test_aux.cpp
index 4c1f3e0..eaa90a1 100644
--- a/tn_range_test_aux.cpp
+++ b/tn_range_test_aux.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "tn_range.tpp"                 // Template class implementation.
 #include "tn_range_test_aux.hpp"        // Trammel class.
diff --git a/tn_range_types.cpp b/tn_range_types.cpp
index 51f27b2..5bf489b 100644
--- a/tn_range_types.cpp
+++ b/tn_range_types.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "tn_range.tpp"                 // Template class implementation.
 #include "tn_range_type_trammels.hpp"   // Trammels for specific tn_range 
types.
diff --git a/transferor.cpp b/transferor.cpp
index f14056d..00ba9a3 100644
--- a/transferor.cpp
+++ b/transferor.cpp
@@ -27,10 +27,10 @@
 // but is implemented differently and has different goals, so any
 // problems introduced here don't reflect on Kevin Smith's reputation.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "transferor.hpp"
 
diff --git a/value_cast_test.cpp b/value_cast_test.cpp
index 5388506..b15aaa4 100644
--- a/value_cast_test.cpp
+++ b/value_cast_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "value_cast.hpp"
 
diff --git a/vector_test.cpp b/vector_test.cpp
index 52bde61..bd8e927 100644
--- a/vector_test.cpp
+++ b/vector_test.cpp
@@ -22,10 +22,10 @@
 // This file is of historical interest only. It shows various attempts
 // to reinvent work that others have done better.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "materially_equal.hpp"
diff --git a/view_ex.cpp b/view_ex.cpp
index 061d408..0e0240b 100644
--- a/view_ex.cpp
+++ b/view_ex.cpp
@@ -27,10 +27,10 @@
 // enhanced view class, and in the later years given in the copyright
 // notice above.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "view_ex.hpp"
 
diff --git a/wx_checks.cpp b/wx_checks.cpp
index 59f8687..4dbe2b0 100644
--- a/wx_checks.cpp
+++ b/wx_checks.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "wx_checks.hpp"
 
diff --git a/wx_new.cpp b/wx_new.cpp
index 82b43ee..d520b81 100644
--- a/wx_new.cpp
+++ b/wx_new.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "wx_new.hpp"
 
diff --git a/wx_new_test.cpp b/wx_new_test.cpp
index e70d3ba..1511dae 100644
--- a/wx_new_test.cpp
+++ b/wx_new_test.cpp
@@ -23,10 +23,10 @@
 // suite ensures that it'll be compiled with stronger warning options
 // than wx would permit.
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 // The '.cpp' file is deliberately included here instead of the header
 // because it was probably already compiled for inclusion in a dll,
diff --git a/wx_table_generator.cpp b/wx_table_generator.cpp
index 8a288e6..338be2c 100644
--- a/wx_table_generator.cpp
+++ b/wx_table_generator.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "wx_table_generator.hpp"
 
diff --git a/wx_test_about_version.cpp b/wx_test_about_version.cpp
index df44329..26c3c9e 100644
--- a/wx_test_about_version.cpp
+++ b/wx_test_about_version.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "calendar_date.hpp"
diff --git a/wx_test_benchmark_census.cpp b/wx_test_benchmark_census.cpp
index 664b796..1c69fb7 100644
--- a/wx_test_benchmark_census.cpp
+++ b/wx_test_benchmark_census.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "wx_test_case.hpp"
diff --git a/wx_test_calculation_summary.cpp b/wx_test_calculation_summary.cpp
index 2007d01..1e1c7da 100644
--- a/wx_test_calculation_summary.cpp
+++ b/wx_test_calculation_summary.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "configurable_settings.hpp"
diff --git a/wx_test_config_settings.cpp b/wx_test_config_settings.cpp
index 51296aa..fe701bd 100644
--- a/wx_test_config_settings.cpp
+++ b/wx_test_config_settings.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "configurable_settings.hpp"
diff --git a/wx_test_create_open.cpp b/wx_test_create_open.cpp
index d884287..eb3bb90 100644
--- a/wx_test_create_open.cpp
+++ b/wx_test_create_open.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "mvc_controller.hpp"
diff --git a/wx_test_default_input.cpp b/wx_test_default_input.cpp
index 34bbc3d..3654e51 100644
--- a/wx_test_default_input.cpp
+++ b/wx_test_default_input.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "calendar_date.hpp"
diff --git a/wx_test_default_update.cpp b/wx_test_default_update.cpp
index c4bd8f2..1047e0a 100644
--- a/wx_test_default_update.cpp
+++ b/wx_test_default_update.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "configurable_settings.hpp"
diff --git a/wx_test_expiry_dates.cpp b/wx_test_expiry_dates.cpp
index c76db7c..2db0637 100644
--- a/wx_test_expiry_dates.cpp
+++ b/wx_test_expiry_dates.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "calendar_date.hpp"
diff --git a/wx_test_input_sequences.cpp b/wx_test_input_sequences.cpp
index ce10dac..4651c7c 100644
--- a/wx_test_input_sequences.cpp
+++ b/wx_test_input_sequences.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "input.hpp"
diff --git a/wx_test_input_validation.cpp b/wx_test_input_validation.cpp
index b00cb19..44a9859 100644
--- a/wx_test_input_validation.cpp
+++ b/wx_test_input_validation.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "global_settings.hpp"
diff --git a/wx_test_log_errors.cpp b/wx_test_log_errors.cpp
index 973b9ca..04b2a37 100644
--- a/wx_test_log_errors.cpp
+++ b/wx_test_log_errors.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "wx_test_case.hpp"
diff --git a/wx_test_paste_census.cpp b/wx_test_paste_census.cpp
index 7ee5aea..33fbb50 100644
--- a/wx_test_paste_census.cpp
+++ b/wx_test_paste_census.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "data_directory.hpp"
diff --git a/wx_test_pdf_create.cpp b/wx_test_pdf_create.cpp
index c2fe808..d1b4fe7 100644
--- a/wx_test_pdf_create.cpp
+++ b/wx_test_pdf_create.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "wx_test_case.hpp"
diff --git a/wx_test_validate_output.cpp b/wx_test_validate_output.cpp
index 851f362..5e3c7f1 100644
--- a/wx_test_validate_output.cpp
+++ b/wx_test_validate_output.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif
+#endif // defined __BORLANDC__
 
 #include "assert_lmi.hpp"
 #include "configurable_settings.hpp"
diff --git a/wx_utility.cpp b/wx_utility.cpp
index d8a9789..2f32f8a 100644
--- a/wx_utility.cpp
+++ b/wx_utility.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "wx_utility.hpp"
 
diff --git a/xml_lmi.cpp b/xml_lmi.cpp
index 25cd673..a5cf133 100644
--- a/xml_lmi.cpp
+++ b/xml_lmi.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "xml_lmi.hpp"
 
diff --git a/xml_serializable.tpp b/xml_serializable.tpp
index de9fe10..71c41e8 100644
--- a/xml_serializable.tpp
+++ b/xml_serializable.tpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "xml_serializable.hpp"
 
@@ -109,9 +109,9 @@ void xml_serializable<T>::read(xml::element const& x)
         }
 
 // COMPILER !! Borland doesn't find operator==() in ns xml.
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 using namespace xml;
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
     std::ostringstream oss;
 
diff --git a/xml_serialize_test.cpp b/xml_serialize_test.cpp
index c2c8361..c321ab1 100644
--- a/xml_serialize_test.cpp
+++ b/xml_serialize_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "xml_serialize.hpp"
 
diff --git a/xml_xslt_wrapp.cpp b/xml_xslt_wrapp.cpp
index c92c9a6..27859af 100644
--- a/xml_xslt_wrapp.cpp
+++ b/xml_xslt_wrapp.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #define HAVE_BOOST_POOL_SINGLETON_POOL_HPP
 
diff --git a/yare_input.cpp b/yare_input.cpp
index 603c0e0..6d125ed 100644
--- a/yare_input.cpp
+++ b/yare_input.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "yare_input.hpp"
 
diff --git a/zero_test.cpp b/zero_test.cpp
index f85bdce..07a5856 100644
--- a/zero_test.cpp
+++ b/zero_test.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#ifdef __BORLANDC__
+#if defined __BORLANDC__
 #   include "pchfile.hpp"
 #   pragma hdrstop
-#endif // __BORLANDC__
+#endif // defined __BORLANDC__
 
 #include "zero.hpp"
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]