From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Tue, 22 Feb 2005 10:41:48 +0000 (+0000)
Subject: Removed dependency on wx/html/forcelnk.h
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/851b16b935163770dcd5bf9ffc0852a204b526a8

Removed dependency on wx/html/forcelnk.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/archive.cpp b/src/common/archive.cpp
index 8ad3fcc2bd..8ba6b2f75b 100644
--- a/src/common/archive.cpp
+++ b/src/common/archive.cpp
@@ -25,13 +25,15 @@
 #if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
 
 #include "wx/archive.h"
-#include "wx/html/forcelnk.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxArchiveEntry, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxObject)
 
 #if wxUSE_ZIPSTREAM
-FORCE_LINK(zipstrm)
+//FORCE_LINK(zipstrm)
+extern int _wx_link_dummy_func_zipstrm();
+static int _wx_link_dummy_var_zipstrm =
+               _wx_link_dummy_func_zipstrm ();
 #endif
 
 
diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 63b941e3a4..f9f9826428 100644
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -34,7 +34,6 @@
 #include "wx/buffer.h"
 #include "wx/ptr_scpd.h"
 #include "wx/wfstream.h"
-#include "wx/html/forcelnk.h"
 #include "zlib.h"
 
 // value for the 'version needed to extract' field (20 means 2.0)
@@ -82,7 +81,12 @@ enum {
 IMPLEMENT_DYNAMIC_CLASS(wxZipEntry, wxArchiveEntry)
 IMPLEMENT_DYNAMIC_CLASS(wxZipClassFactory, wxArchiveClassFactory)
 
-FORCE_LINK_ME(zipstrm)
+//FORCE_LINK_ME(zipstrm)
+int _wx_link_dummy_func_zipstrm();
+int _wx_link_dummy_func_zipstrm()
+{
+    return 1;
+}
 
 
 /////////////////////////////////////////////////////////////////////////////