#1673 Wrap two lwdisp macros in ifndef

closed-rejected
elsapo
2
2006-02-04
2006-02-04
elsapo
No

Wrap VTS_UI1 and VTS_PUI1 in ifndef statements.

** From

#define VTS_PUI1 "\x4F" // a 'BYTE*'

** To

#ifndef VTS_PUI1
#define VTS_PUI1 "\x4F" // a 'BYTE*'
#endif

This fixes

BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition
warnings (VS.NET)

https://sourceforge.net/tracker/index.php?func=detail&aid=1395475&group_id=13216&atid=113216

Discussion

  • elsapo

    elsapo - 2006-02-04

    Logged In: YES
    user_id=1195173

    Fixing in cvs trunk.

    **

    PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
    Src/Common: lwdisp.h

    **

    Checking in Src/Changes.txt;
    /cvsroot/winmerge/WinMerge/Src/Changes.txt,v <-- Changes.txt
    new revision: 1.269; previous revision: 1.268
    done
    Checking in Src/Common/lwdisp.h;
    /cvsroot/winmerge/WinMerge/Src/Common/lwdisp.h,v <-- lwdisp.h
    new revision: 1.9; previous revision: 1.8
    done

    ***** CVS exited normally with code 0 *****

     
  • elsapo

    elsapo - 2006-02-04
    • assigned_to: nobody --> elsapo
    • status: open --> open-accepted
     
  • elsapo

    elsapo - 2006-02-04

    Logged In: YES
    user_id=1195173

    Whoops:

    #1) It is only VTS_PUI1 that is the issue.

    #2) Our definition is different from the one in the header
    with VS.NET 2003.

    #3) We never use this constant.

    So, I think we should instead remove the constant from the
    header, instead of using a protected definition.

     
  • elsapo

    elsapo - 2006-02-04

    Logged In: YES
    user_id=1195173

    Undoing & rejecting this patch.

    **

    Undo PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
    Src/Common: lwdisp.h

    **

    Checking in Src/Common/lwdisp.h;
    /cvsroot/winmerge/WinMerge/Src/Common/lwdisp.h,v <-- lwdisp.h
    new revision: 1.10; previous revision: 1.9
    done

    ***** CVS exited normally with code 0 *****

     
  • elsapo

    elsapo - 2006-02-04
    • status: open-accepted --> closed-rejected
     
  • Nobody/Anonymous

    Logged In: NO

    http://cc99fd1712961f2c577ad0ec89a4f6d7-t.qjhuma.org <a href="http://cc99fd1712961f2c577ad0ec89a4f6d7-h.qjhuma.org">cc99fd1712961f2c577ad0ec89a4f6d7</a> [url]http://cc99fd1712961f2c577ad0ec89a4f6d7-b1.qjhuma.org[/url] [url=http://cc99fd1712961f2c577ad0ec89a4f6d7-b2.qjhuma.org]cc99fd1712961f2c577ad0ec89a4f6d7[/url] [u]http://cc99fd1712961f2c577ad0ec89a4f6d7-b3.qjhuma.org[/u] 5da269d70f258be2341c2332392a1020

     

Log in to post a comment.