more extra semicolons removed (patch 1303724)

[wxWidgets.git] / include / wx / html / forcelnk.h

diff --git a/include/wx/html/forcelnk.h b/include/wx/html/forcelnk.h
index 16485fdd57e755d70b6a5deef7fddfb6c29fc312..42cb66f95fdd6a9dddae1c2de65930e544abb608 100644 (file)
--- a/include/wx/html/forcelnk.h
+++ b/include/wx/html/forcelnk.h
@@ -44,7 +44,8 @@ See mod_*.cpp and htmlwin.cpp for example :-)
 
 // This must be part of the module you want to force:
 #define FORCE_LINK_ME(module_name)                                    \
-                int _link_dummy_func_##module_name ()                 \
+                int _wx_link_dummy_func_##module_name ();             \
+                int _wx_link_dummy_func_##module_name ()              \
                 {                                                     \
                     return 1;                                         \
                 }
@@ -52,9 +53,21 @@ See mod_*.cpp and htmlwin.cpp for example :-)
 
 // And this must be somewhere where it certainly will be linked:
 #define FORCE_LINK(module_name)                                       \
-                extern int _link_dummy_func_##module_name ();         \
-                static int _link_dummy_var_##module_name =            \
-                               _link_dummy_func_##module_name ();
+                extern int _wx_link_dummy_func_##module_name ();      \
+                static int _wx_link_dummy_var_##module_name =         \
+                               _wx_link_dummy_func_##module_name ();
+
+#define FORCE_WXHTML_MODULES() \
+    FORCE_LINK(m_layout) \
+    FORCE_LINK(m_fonts) \
+    FORCE_LINK(m_image) \
+    FORCE_LINK(m_list) \
+    FORCE_LINK(m_dflist) \
+    FORCE_LINK(m_pre) \
+    FORCE_LINK(m_hline) \
+    FORCE_LINK(m_links) \
+    FORCE_LINK(m_tables) \
+    FORCE_LINK(m_style)
 
 
 #endif // _WX_FORCELNK_H_