Commit: 8301c4ab2c8a823c6a27854e640fe7259398ea97 - uim (git)

A multilingual input method framework

Commit MetaInfo

• Revision: 8301c4ab2c8a823c6a27854e640fe7259398ea97 (tree)
• Time: 2006-12-22 10:02:30
• Author: yamaken <yamaken@ff9a...>
• Commiter: yamaken

Log Message

* sigscheme/src/global.h

- (SCM_DEFINE_GLOBAL_VARS_INSTANCE_ACCESSOR,

SCM_DEFINE_EXPORTED_VARS): Suppress warning

* sigscheme/QALog

- Update

Change Summary

• modified: sigscheme/QALog
• modified: sigscheme/src/global.h

Incremental Difference

--- a/sigscheme/QALog
+++ b/sigscheme/QALog
@@ -482,7 +482,7 @@ corner case tests:
 
 file:              global.h
 category:          base
-spec by eyes:      yamaken@r4060
+spec by eyes:      yamaken@r4060, yamaken@r4175
 spec by tests:     
 general review:    yamaken@r4060
 64-bit by eyes:    yamaken@r4060

--- a/sigscheme/src/global.h
+++ b/sigscheme/src/global.h
@@ -127,7 +127,7 @@ extern "C" {
     {                                                                        \
         return &SCM_AGGREGATED_GLOBAL_VARS_INSTANCE()._namespace;            \
     }                                                                        \
-    extern int scm_g_dummy
+    extern int scm_g_dummy_##_namespace
 
 #else /* SCM_USE_AGGREGATED_GLOBAL_VARS */
 
@@ -163,7 +163,7 @@ extern "C" {
 #define SCM_DECLARE_EXPORTED_VARS(_namespace)                                \
     SCM_EXPORT struct scm_g_##_namespace *scm_g_instance_##_namespace(void)
 #define SCM_DEFINE_EXPORTED_VARS(_namespace)                                 \
-    extern int scm_g_dummy
+    extern int scm_g_dummy_##_namespace
 #if !SCM_COMBINED_SOURCE
 #error "(SCM_USE_AGGREGATED_GLOBAL_VARS && !SCM_COMBINED_SOURCE) is not supported"
 #endif /* SCM_COMBINED_SOURCE */