* DLLEXPORT decoration tweak, from Rex Sung-Tien Cho <song10@andestech.com>

diff --git a/sid/component/audio/components.cxx b/sid/component/audio/components.cxx
index 818cad1..0e01738 100644 (file)
--- a/sid/component/audio/components.cxx
+++ b/sid/component/audio/components.cxx
@@ -77,9 +77,9 @@ compAudioDelete (component* c)
 
 
 // static object
-extern const component_library audio_component_library;
+DLLEXPORT extern const component_library audio_component_library;
 
-const component_library audio_component_library DLLEXPORT = 
+const component_library audio_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & compAudioListTypes, 

diff --git a/sid/component/bochs/components.cxx b/sid/component/bochs/components.cxx
index a3def5d..215ca32 100644 (file)
--- a/sid/component/bochs/components.cxx
+++ b/sid/component/bochs/components.cxx
@@ -183,9 +183,9 @@ compX86Delete(component* c)
 
 
 // static object
-extern const component_library x86_component_library;
+DLLEXPORT extern const component_library x86_component_library;
 
-const component_library x86_component_library DLLEXPORT = 
+const component_library x86_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & compX86ListTypes, 

diff --git a/sid/component/cache/cache.cxx b/sid/component/cache/cache.cxx
index 6374a03..545bb12 100644 (file)
--- a/sid/component/cache/cache.cxx
+++ b/sid/component/cache/cache.cxx
@@ -1046,8 +1046,6 @@ cache_replacement_random::expell (cache_set& cset)
 }
 
 \f
-extern const sid::component_library cache_component_library;
-
 static vector<string>
 CacheListTypes ()
 {
@@ -1210,7 +1208,9 @@ CacheDelete (component* c)
   delete dynamic_cast<cache_component*>(c);
 }
 
-const sid::component_library cache_component_library DLLEXPORT =
+DLLEXPORT extern const sid::component_library cache_component_library;
+
+const sid::component_library cache_component_library =
 {
   sid::COMPONENT_LIBRARY_MAGIC,
   &CacheListTypes,

diff --git a/sid/component/cfgroot/compConfig.cxx b/sid/component/cfgroot/compConfig.cxx
index c784371..169013b 100644 (file)
--- a/sid/component/cfgroot/compConfig.cxx
+++ b/sid/component/cfgroot/compConfig.cxx
@@ -1769,9 +1769,9 @@ compConfigDelete(component* c)
 
 
 // static object
-extern const component_library config_component_library;
+DLLEXPORT extern const component_library config_component_library;
 
-const component_library config_component_library DLLEXPORT = 
+const component_library config_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & compConfigListTypes, 

diff --git a/sid/component/cgen-cpu/compCGEN.cxx b/sid/component/cgen-cpu/compCGEN.cxx
index 71355f1..7e9cf58 100644 (file)
--- a/sid/component/cgen-cpu/compCGEN.cxx
+++ b/sid/component/cgen-cpu/compCGEN.cxx
@@ -328,9 +328,9 @@ compCGENDelete (component* c)
 
 
 // static object
-extern const component_library cgen_component_library;
+DLLEXPORT extern const component_library cgen_component_library;
 
-const component_library cgen_component_library DLLEXPORT = 
+const component_library cgen_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & compCGENListTypes, 

diff --git a/sid/component/consoles/components.cxx b/sid/component/consoles/components.cxx
index 66f1db0..a3f39d8 100644 (file)
--- a/sid/component/consoles/components.cxx
+++ b/sid/component/consoles/components.cxx
@@ -53,8 +53,8 @@ compConsoleDelete(component* c)
 } // end of namespace console_stuff
 
 
-extern const sid::component_library console_component_library;
-const sid::component_library console_component_library DLLEXPORT =
+DLLEXPORT extern const sid::component_library console_component_library;
+const sid::component_library console_component_library =
 {
   sid::COMPONENT_LIBRARY_MAGIC,
   & console_stuff::compConsoleListTypes,

diff --git a/sid/component/gdb/gdb.cxx b/sid/component/gdb/gdb.cxx
index 4ef22c3..d20abc5 100644 (file)
--- a/sid/component/gdb/gdb.cxx
+++ b/sid/component/gdb/gdb.cxx
@@ -1964,9 +1964,9 @@ gdb_delete (component* c)
 }
 
 // static object
-extern const component_library gdb_component_library;
+DLLEXPORT extern const component_library gdb_component_library;
 
-const component_library gdb_component_library DLLEXPORT = {
+const component_library gdb_component_library = {
   COMPONENT_LIBRARY_MAGIC,
   & gdb_list_types, 
   & gdb_create,

diff --git a/sid/component/gloss/compGloss.cxx b/sid/component/gloss/compGloss.cxx
index 451418b..b7a66a7 100644 (file)
--- a/sid/component/gloss/compGloss.cxx
+++ b/sid/component/gloss/compGloss.cxx
@@ -89,9 +89,9 @@ compGlossDelete(component* c)
 
 
 // static object
-extern const component_library gloss_component_library;
+DLLEXPORT extern const component_library gloss_component_library;
 
-const component_library gloss_component_library DLLEXPORT = 
+const component_library gloss_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & compGlossListTypes, 

diff --git a/sid/component/glue/glue.cxx b/sid/component/glue/glue.cxx
index 31b3056..9fa0d74 100644 (file)
--- a/sid/component/glue/glue.cxx
+++ b/sid/component/glue/glue.cxx
@@ -795,9 +795,9 @@ pin_pacer_component::pin_pacer_component():
 
 
 // static object in root namespace
-extern const sid::component_library glue_component_library;
+DLLEXPORT extern const sid::component_library glue_component_library;
 
-const sid::component_library glue_component_library DLLEXPORT = 
+const sid::component_library glue_component_library =
 {
   sid::COMPONENT_LIBRARY_MAGIC,
   & glue_components::list_types, 

diff --git a/sid/component/ide/compIDE.cxx b/sid/component/ide/compIDE.cxx
index 503c38c..f23a4ce 100644 (file)
--- a/sid/component/ide/compIDE.cxx
+++ b/sid/component/ide/compIDE.cxx
@@ -1163,9 +1163,9 @@ compIdeDelete(component* c)
 
 
 // static object
-extern const component_library ide_component_library;
+DLLEXPORT extern const component_library ide_component_library;
 
-const component_library ide_component_library DLLEXPORT = 
+const component_library ide_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & compIdeListTypes, 

diff --git a/sid/component/interrupt/components.cxx b/sid/component/interrupt/components.cxx
index 458a594..c670a04 100644 (file)
--- a/sid/component/interrupt/components.cxx
+++ b/sid/component/interrupt/components.cxx
@@ -47,9 +47,9 @@ compInterruptDelete(component* c)
 #endif
 }
 
-extern const component_library interrupt_component_library;
+DLLEXPORT extern const component_library interrupt_component_library;
 
-const component_library interrupt_component_library DLLEXPORT =
+const component_library interrupt_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   &compInterruptListTypes,

diff --git a/sid/component/lcd/HD44780U.cxx b/sid/component/lcd/HD44780U.cxx
index 5d8a899..c8604f0 100644 (file)
--- a/sid/component/lcd/HD44780U.cxx
+++ b/sid/component/lcd/HD44780U.cxx
@@ -645,9 +645,9 @@ HD44780U_Delete( component* c ) {
 }
 
 // static object
-extern const component_library hd44780u_component_library;
+DLLEXPORT extern const component_library hd44780u_component_library;
 
-const component_library hd44780u_component_library DLLEXPORT = 
+const component_library hd44780u_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & HD44780U_ListTypes, 

diff --git a/sid/component/lcd/T6963C.cxx b/sid/component/lcd/T6963C.cxx
index c855068..a633706 100644 (file)
--- a/sid/component/lcd/T6963C.cxx
+++ b/sid/component/lcd/T6963C.cxx
@@ -927,9 +927,9 @@ T6963C_Delete( component* c ) {
 
 
 // static object
-extern const component_library t6963c_component_library;
+DLLEXPORT extern const component_library t6963c_component_library;
 
-const component_library t6963c_component_library DLLEXPORT = 
+const component_library t6963c_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & T6963C_ListTypes, 

diff --git a/sid/component/lcd/lcd-char-display.cxx b/sid/component/lcd/lcd-char-display.cxx
index 27bbc44..9e16b1f 100644 (file)
--- a/sid/component/lcd/lcd-char-display.cxx
+++ b/sid/component/lcd/lcd-char-display.cxx
@@ -211,9 +211,9 @@ DevicesDelete(component* c)
 }
 
 // static object
-extern const component_library lcd_char_display_component_library;
+DLLEXPORT extern const component_library lcd_char_display_component_library;
 
-const component_library lcd_char_display_component_library DLLEXPORT = 
+const component_library lcd_char_display_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & DevicesListTypes, 

diff --git a/sid/component/lcd/testsuite/hd-5X10.cxx b/sid/component/lcd/testsuite/hd-5X10.cxx
index dfd935b..480ff56 100644 (file)
--- a/sid/component/lcd/testsuite/hd-5X10.cxx
+++ b/sid/component/lcd/testsuite/hd-5X10.cxx
@@ -131,9 +131,9 @@ HD44780UTesterDelete( component* c ) {
 
 
 // static object
-extern const component_library hd5X10_tester_component_library;
+DLLEXPORT extern const component_library hd5X10_tester_component_library;
 
-const component_library hd5X10_tester_component_library DLLEXPORT = 
+const component_library hd5X10_tester_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & HD44780UTesterListTypes, 

diff --git a/sid/component/lcd/testsuite/hd-europe.cxx b/sid/component/lcd/testsuite/hd-europe.cxx
index 7d03400..0161b66 100644 (file)
--- a/sid/component/lcd/testsuite/hd-europe.cxx
+++ b/sid/component/lcd/testsuite/hd-europe.cxx
@@ -122,9 +122,9 @@ HD44780UTesterDelete( component* c ) {
 
 
 // static object
-extern const component_library hd2l_tester_component_library;
+DLLEXPORT extern const component_library hd2l_tester_component_library;
 
-const component_library hd2l_tester_component_library DLLEXPORT = 
+const component_library hd2l_tester_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & HD44780UTesterListTypes, 

diff --git a/sid/component/lcd/testsuite/hd-one-line.cxx b/sid/component/lcd/testsuite/hd-one-line.cxx
index 649ce3f..ebceaac 100644 (file)
--- a/sid/component/lcd/testsuite/hd-one-line.cxx
+++ b/sid/component/lcd/testsuite/hd-one-line.cxx
@@ -88,9 +88,9 @@ HD44780UTesterDelete( component* c ) {
 
 
 // static object
-extern const component_library hd1l_tester_component_library;
+DLLEXPORT extern const component_library hd1l_tester_component_library;
 
-const component_library hd1l_tester_component_library DLLEXPORT = 
+const component_library hd1l_tester_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & HD44780UTesterListTypes, 

diff --git a/sid/component/lcd/testsuite/hd-two-line.cxx b/sid/component/lcd/testsuite/hd-two-line.cxx
index b7966a9..dab2e2b 100644 (file)
--- a/sid/component/lcd/testsuite/hd-two-line.cxx
+++ b/sid/component/lcd/testsuite/hd-two-line.cxx
@@ -230,9 +230,9 @@ HD44780UTesterDelete( component* c ) {
 
 
 // static object
-extern const component_library hd2l_tester_component_library;
+DLLEXPORT extern const component_library hd2l_tester_component_library;
 
-const component_library hd2l_tester_component_library DLLEXPORT = 
+const component_library hd2l_tester_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & HD44780UTesterListTypes, 

diff --git a/sid/component/lcd/testsuite/t6963c-japan.cxx b/sid/component/lcd/testsuite/t6963c-japan.cxx
index d5c74cf..c0a622e 100644 (file)
--- a/sid/component/lcd/testsuite/t6963c-japan.cxx
+++ b/sid/component/lcd/testsuite/t6963c-japan.cxx
@@ -414,9 +414,9 @@ T6963CTesterDelete( component* c ) {
 
 
 // static object
-extern const component_library t6963c_tester_component_library;
+DLLEXPORT extern const component_library t6963c_tester_component_library;
 
-const component_library t6963c_tester_component_library DLLEXPORT = 
+const component_library t6963c_tester_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & T6963CTesterListTypes, 

diff --git a/sid/component/lcd/testsuite/t6963c-tester.cxx b/sid/component/lcd/testsuite/t6963c-tester.cxx
index 763e10e..f93ce49 100644 (file)
--- a/sid/component/lcd/testsuite/t6963c-tester.cxx
+++ b/sid/component/lcd/testsuite/t6963c-tester.cxx
@@ -596,9 +596,9 @@ T6963CTesterDelete( component* c ) {
 
 
 // static object
-extern const component_library t6963c_tester_component_library;
+DLLEXPORT extern const component_library t6963c_tester_component_library;
 
-const component_library t6963c_tester_component_library DLLEXPORT = 
+const component_library t6963c_tester_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & T6963CTesterListTypes, 

diff --git a/sid/component/loader/compLoader.cxx b/sid/component/loader/compLoader.cxx
index ebc81f4..82ded1a 100644 (file)
--- a/sid/component/loader/compLoader.cxx
+++ b/sid/component/loader/compLoader.cxx
@@ -487,9 +487,9 @@ compLoaderDelete(component* c)
 }
 
 // static object
-extern const component_library loader_component_library;
+DLLEXPORT extern const component_library loader_component_library;
 
-const component_library loader_component_library DLLEXPORT = 
+const component_library loader_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & compLoaderListTypes, 

diff --git a/sid/component/mapper/compMapper.cxx b/sid/component/mapper/compMapper.cxx
index d65773a..22b56b4 100644 (file)
--- a/sid/component/mapper/compMapper.cxx
+++ b/sid/component/mapper/compMapper.cxx
@@ -1010,9 +1010,9 @@ compMapperDelete (component* c)
 
 
 // static object
-extern const component_library mapper_component_library;
+DLLEXPORT extern const component_library mapper_component_library;
 
-const component_library mapper_component_library DLLEXPORT = 
+const component_library mapper_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & compMapperListTypes, 

diff --git a/sid/component/mapper/testsuite/busif.cxx b/sid/component/mapper/testsuite/busif.cxx
index e4f0a41..3dff288 100644 (file)
--- a/sid/component/mapper/testsuite/busif.cxx
+++ b/sid/component/mapper/testsuite/busif.cxx
@@ -138,9 +138,9 @@ BusifDelete( component* c ) {
 }
 
 // static object
-extern const component_library busif_component_library;
+DLLEXPORT extern const component_library busif_component_library;
 
-const component_library busif_component_library DLLEXPORT = 
+const component_library busif_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & BusifListTypes, 

diff --git a/sid/component/memory/components.cxx b/sid/component/memory/components.cxx
index 2c0004f..cdd2017 100644 (file)
--- a/sid/component/memory/components.cxx
+++ b/sid/component/memory/components.cxx
@@ -108,9 +108,9 @@ compMemoryDelete(component* c)
 
 
 // static object
-extern const component_library mem_component_library;
+DLLEXPORT extern const component_library mem_component_library;
 
-const component_library mem_component_library DLLEXPORT = 
+const component_library mem_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & compMemoryListTypes, 

diff --git a/sid/component/mmu/armRemap.cxx b/sid/component/mmu/armRemap.cxx
index 4bfba20..eb4fcdd 100644 (file)
--- a/sid/component/mmu/armRemap.cxx
+++ b/sid/component/mmu/armRemap.cxx
@@ -711,8 +711,6 @@ armRemapPause::bus_interface::word_read(host_int_4 addr,
 #endif // SIDTARGET_ARM
 
 
-extern const component_library mmu_component_library;
-
 static vector<string>
 compMmuListTypes()
 {
@@ -742,7 +740,9 @@ compMmuDelete(component* c)
 }
 
 
-const component_library mmu_component_library DLLEXPORT =
+DLLEXPORT extern const component_library mmu_component_library;
+
+const component_library mmu_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   &compMmuListTypes,

diff --git a/sid/component/parport/ps2.cxx b/sid/component/parport/ps2.cxx
index 51c97ee..50340ca 100644 (file)
--- a/sid/component/parport/ps2.cxx
+++ b/sid/component/parport/ps2.cxx
@@ -1390,9 +1390,9 @@ ParPortDelete(component* c)
 
 
 // static object
-extern const component_library parport_component_library;
+DLLEXPORT extern const component_library parport_component_library;
 
-const component_library parport_component_library DLLEXPORT = 
+const component_library parport_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & ParPortListTypes, 

diff --git a/sid/component/profiling/gprof.cxx b/sid/component/profiling/gprof.cxx
index e6e46d2..ddebcea 100644 (file)
--- a/sid/component/profiling/gprof.cxx
+++ b/sid/component/profiling/gprof.cxx
@@ -631,9 +631,9 @@ namespace profiling_components
 
 
 // static object in root namespace
-extern const sid::component_library prof_component_library;
+DLLEXPORT extern const sid::component_library prof_component_library;
 
-const sid::component_library prof_component_library DLLEXPORT = 
+const sid::component_library prof_component_library =
 {
   sid::COMPONENT_LIBRARY_MAGIC,
   & profiling_components::list_types, 

diff --git a/sid/component/rtc/components.cxx b/sid/component/rtc/components.cxx
index 25d5d95..a2ee152 100644 (file)
--- a/sid/component/rtc/components.cxx
+++ b/sid/component/rtc/components.cxx
@@ -45,9 +45,9 @@ rtcDelete(component* c)
 
 
 // static object
-extern const component_library rtc_component_library;
+DLLEXPORT extern const component_library rtc_component_library;
 
-const component_library rtc_component_library DLLEXPORT =
+const component_library rtc_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & rtcListTypes,

diff --git a/sid/component/sched/compSched.cxx b/sid/component/sched/compSched.cxx
index d84ee58..64d6a76 100644 (file)
--- a/sid/component/sched/compSched.cxx
+++ b/sid/component/sched/compSched.cxx
@@ -1633,9 +1633,9 @@ scheduler_component<Scheduler>::client_num_update ()
 
 
 // static object in root namespace
-extern const sid::component_library sched_component_library;
+DLLEXPORT extern const sid::component_library sched_component_library;
 
-const sid::component_library sched_component_library DLLEXPORT = 
+const sid::component_library sched_component_library =
 {
   sid::COMPONENT_LIBRARY_MAGIC,
   & scheduler_component::list_types, 

diff --git a/sid/component/tcl/compTcl.cxx b/sid/component/tcl/compTcl.cxx
index 2fcfb7a..3043e06 100644 (file)
--- a/sid/component/tcl/compTcl.cxx
+++ b/sid/component/tcl/compTcl.cxx
@@ -2315,9 +2315,9 @@ do_delete (component* c)
 
 
 // static object
-extern const sid::component_library tcl_bridge_library;
+DLLEXPORT extern const sid::component_library tcl_bridge_library;
 
-const sid::component_library tcl_bridge_library DLLEXPORT = 
+const sid::component_library tcl_bridge_library =
 {
   sid::COMPONENT_LIBRARY_MAGIC,
   & tcl_api_component::list_types, 

diff --git a/sid/component/timers/compTIMERS.cxx b/sid/component/timers/compTIMERS.cxx
index c214e68..328268d 100644 (file)
--- a/sid/component/timers/compTIMERS.cxx
+++ b/sid/component/timers/compTIMERS.cxx
@@ -21,8 +21,6 @@ using namespace sid;
 #endif
 
  
-extern const component_library timer_component_library;
-
 static vector<string>
 compTimerListTypes()
 {
@@ -58,7 +56,9 @@ compTimerDelete(component* c)
 }
 
 
-const component_library timer_component_library DLLEXPORT =
+DLLEXPORT extern const component_library timer_component_library;
+
+const component_library timer_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   &compTimerListTypes,

diff --git a/sid/component/uart/Uart.cxx b/sid/component/uart/Uart.cxx
index c731bec..bb1e30c 100644 (file)
--- a/sid/component/uart/Uart.cxx
+++ b/sid/component/uart/Uart.cxx
@@ -1458,9 +1458,9 @@ UartDelete(component* c)
 
 
 // static object
-extern const component_library uart_component_library;
+DLLEXPORT extern const component_library uart_component_library;
 
-const component_library uart_component_library DLLEXPORT = 
+const component_library uart_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & UartListTypes, 

diff --git a/sid/component/uart/testsuite/Devices.cxx b/sid/component/uart/testsuite/Devices.cxx
index 70a54d1..c2b5e77 100644 (file)
--- a/sid/component/uart/testsuite/Devices.cxx
+++ b/sid/component/uart/testsuite/Devices.cxx
@@ -270,9 +270,9 @@ DevicesDelete(component* c)
 
 
 // static object
-extern const component_library devices_component_library;
+DLLEXPORT extern const component_library devices_component_library;
 
-const component_library devices_component_library DLLEXPORT = 
+const component_library devices_component_library =
 {
   COMPONENT_LIBRARY_MAGIC,
   & DevicesListTypes, 

diff --git a/sid/doc/cdk-guide/book-cdk.sgml b/sid/doc/cdk-guide/book-cdk.sgml
index 0f40307..b1f67eb 100644 (file)
--- a/sid/doc/cdk-guide/book-cdk.sgml
+++ b/sid/doc/cdk-guide/book-cdk.sgml
@@ -2545,9 +2545,9 @@ TimerDelete(sid::component* c) NT
 // This symbol is used by the library loader to validate the library
 // and instantiate components of the types supported by this library.
 
-extern const sid::component_library example_component_library;
+DLLEXPORT extern const sid::component_library example_component_library;
 
-const sid::component_library example_component_library DLLEXPORT =
+const sid::component_library example_component_library =
 {
   sid::COMPONENT_LIBRARY_MAGIC,
   & timer_example::TimerListTypes,

diff --git a/sid/samples/timer.cxx b/sid/samples/timer.cxx
index 5c0f5d0..52acd91 100644 (file)
--- a/sid/samples/timer.cxx
+++ b/sid/samples/timer.cxx
@@ -664,9 +664,9 @@ TimerDelete(sid::component* c)
 // This symbol is used by the library loader to validate the library
 // and instantiate components of the types supported by this library.
 
-extern const sid::component_library example_component_library;
+DLLEXPORT extern const sid::component_library example_component_library;
 
-const sid::component_library example_component_library DLLEXPORT =
+const sid::component_library example_component_library =
 {
   sid::COMPONENT_LIBRARY_MAGIC,
   &timer_example::TimerListTypes,