Subject: [PATCH] Tiny patch for building on Win32
From: David Mandelin (mandelin@cs.wisc.edu)
Date: Tue Sep 18 2001 - 16:12:24 CDT
That's all.
Index: src/af/util/Makefile
===================================================================
RCS file: /cvsroot/abi/src/af/util/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- src/af/util/Makefile	2001/09/06 09:01:53	1.61
+++ src/af/util/Makefile	2001/09/18 21:10:00
@@ -87,6 +87,7 @@
                 $(OBJDIR)/ut_growbuf.$(OBJ_SUFFIX)		\
                 $(OBJDIR)/ut_hash.$(OBJ_SUFFIX)			\
                 $(OBJDIR)/ut_iconv.$(OBJ_SUFFIX)		\
+		$(OBJDIR)/ut_idle.$(OBJ_SUFFIX)		\
                 $(OBJDIR)/ut_mbtowc.$(OBJ_SUFFIX)		\
                 $(OBJDIR)/ut_misc.$(OBJ_SUFFIX)			\
                 $(OBJDIR)/ut_png.$(OBJ_SUFFIX)			\
@@ -102,6 +103,7 @@
                 $(OBJDIR)/ut_timer.$(OBJ_SUFFIX)		\
                 $(OBJDIR)/ut_types.$(OBJ_SUFFIX)		\
                 $(OBJDIR)/ut_units.$(OBJ_SUFFIX)		\
+		$(OBJDIR)/ut_worker.$(OBJ_SUFFIX)		\
                 $(OBJDIR)/ut_pair.$(OBJ_SUFFIX)			\
                 $(OBJDIR)/ut_bijection.$(OBJ_SUFFIX)		\
                 $(OBJDIR)/ut_vector.$(OBJ_SUFFIX)		\
Index: src/wp/ap/win/ap_Win32Dialog_Lists.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_Lists.cpp,v
retrieving revision 1.23
diff -u -r1.23 ap_Win32Dialog_Lists.cpp
--- src/wp/ap/win/ap_Win32Dialog_Lists.cpp	2001/09/10 20:18:30	1.23
+++ src/wp/ap/win/ap_Win32Dialog_Lists.cpp	2001/09/18 21:10:15
@@ -205,7 +205,7 @@
 
         activate();
 
-	m_pAutoUpdateLists = UT_Timer::static_constructor(autoupdateLists, this);
+	m_pAutoUpdateLists = UT_Timer::static_constructor(reinterpret_cast<UT_WorkerCallback>(autoupdateLists), this);
         m_pAutoUpdateLists->set(500);	// auto-updater at 1/2 Hz
 
         return 1;							// 1 == we did not call SetFocus()
Index: src/wp/ap/win/ap_Win32Dialog_WordCount.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_WordCount.cpp,v
retrieving revision 1.8
diff -u -r1.8 ap_Win32Dialog_WordCount.cpp
--- src/wp/ap/win/ap_Win32Dialog_WordCount.cpp	2001/02/06 22:54:55	1.8
+++ src/wp/ap/win/ap_Win32Dialog_WordCount.cpp	2001/09/18 21:10:15
@@ -262,7 +262,7 @@
                 CheckDlgButton(hWnd, AP_RID_DIALOG_WORDCOUNT_CHK_AUTOUPDATE, BST_CHECKED);
 
         GR_Graphics * pG = NULL;
-	m_pAutoUpdateWC = UT_Timer::static_constructor(autoupdateWC,this,pG);
+	m_pAutoUpdateWC = UT_Timer::static_constructor(reinterpret_cast<UT_WorkerCallback>(autoupdateWC),this,pG);
         setUpdateCounter( 1 );
 
         // localize controls
This archive was generated by hypermail 2b25 : Tue Sep 18 2001 - 16:12:29 CDT