Re: Patch: Fix win32 cvs-head build

From: Dom Lachowicz (domlachowicz_at_yahoo.com)
Date: Tue Apr 06 2004 - 18:33:36 EDT

  • Next message: Hubert Figuiere: "Commit (HEAD) Re: Patch: Fix win32 cvs-head build"

    If no one applies this before I get home, I'll take
    care of it. This patch is obviously correct.

    Thanks Mikey. It's appreciated.
    Dom

    --- Mikey Cooper <mikey_at_bluey.com> wrote:
    > The attached patch fixes recently converted
    > UT_return_if_fail entries
    > and allows cvs-head to build on win32 again.
    >
    > Mikey
    > > Index: wp/ap/win/ap_Win32Dialog_Break.cpp
    >
    ===================================================================
    > RCS file:
    >
    /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_Break.cpp,v
    > retrieving revision 1.9
    > diff -u -r1.9 ap_Win32Dialog_Break.cpp
    > --- wp/ap/win/ap_Win32Dialog_Break.cpp 3 Apr 2004
    > 17:41:57 -0000 1.9
    > +++ wp/ap/win/ap_Win32Dialog_Break.cpp 6 Apr 2004
    > 21:52:02 -0000
    > @@ -58,7 +58,7 @@
    > void AP_Win32Dialog_Break::runModal(XAP_Frame *
    > pFrame)
    > {
    > // raise the dialog
    > - UT_return_if_fail (pFrame, m_id ==
    > AP_DIALOG_ID_BREAK);
    > + UT_return_if_fail (m_id == AP_DIALOG_ID_BREAK);
    > XAP_Win32App * pWin32App =
    > static_cast<XAP_Win32App *>(m_pApp);
    >
    > XAP_Win32LabelledSeparator_RegisterClass(pWin32App);
    > setDialog(this);
    > Index: wp/ap/win/ap_Win32Dialog_Columns.cpp
    >
    ===================================================================
    > RCS file:
    >
    /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_Columns.cpp,v
    > retrieving revision 1.17
    > diff -u -r1.17 ap_Win32Dialog_Columns.cpp
    > --- wp/ap/win/ap_Win32Dialog_Columns.cpp 3 Apr 2004
    > 17:41:57 -0000 1.17
    > +++ wp/ap/win/ap_Win32Dialog_Columns.cpp 6 Apr 2004
    > 21:52:02 -0000
    > @@ -64,7 +64,7 @@
    >
    > void AP_Win32Dialog_Columns::runModal(XAP_Frame *
    > pFrame)
    > {
    > - UT_return_if_fail (pFrame, m_id ==
    > AP_DIALOG_ID_COLUMNS);
    > + UT_return_if_fail (m_id == AP_DIALOG_ID_COLUMNS);
    >
    > // raise the dialog
    > setViewAndDoc(pFrame);
    >

    __________________________________
    Do you Yahoo!?
    Yahoo! Small Business $15K Web Design Giveaway
    http://promotions.yahoo.com/design_giveaway/

    This archive was generated by hypermail 2.1.4 : Tue Apr 06 2004 - 18:36:38 EDT