diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2018-01-21 01:09:18 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2018-01-21 01:09:18 +0000 |
| commit | adfc6a946c36f60a595dc2efb83d8247c79f3c8f (patch) | |
| tree | c9538385795dcc66ef4789a81673258694e78016 /graphics/libfpx/files/patch-null-casts | |
| parent | Update security/pinentry* to 1.1.0 [1] (diff) | |
Upgrade from 1.3.1-4 to 1.3.1-10 (security fixes).
Resolve errors triggered on -current by the use of C++17
PR: 225299
Notes
Notes:
svn path=/head/; revision=459561
Diffstat (limited to 'graphics/libfpx/files/patch-null-casts')
| -rw-r--r-- | graphics/libfpx/files/patch-null-casts | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/graphics/libfpx/files/patch-null-casts b/graphics/libfpx/files/patch-null-casts index 918be6db3c39..d09109fefd34 100644 --- a/graphics/libfpx/files/patch-null-casts +++ b/graphics/libfpx/files/patch-null-casts @@ -1,5 +1,5 @@ --- oless/expdf.cxx 2013-09-02 11:47:00.000000000 -0400 -+++ oless/expdf.cxx 2014-02-14 14:29:24.000000000 -0500 ++++ oless/expdf.cxx 2018-01-20 19:59:14.495701000 -0500 @@ -610,5 +610,5 @@ olErr(EH_Err, STG_E_INVALIDFUNCTION); olChk(Validate()); @@ -21,3 +21,26 @@ + 0, &pstmsrc)); // It's a stream +@@ -1575,5 +1575,5 @@ + olMemTo(EH_pst, pstExp = new CExposedStream()); + olChkTo(EH_pstExp, pstExp->Init(pstDirect, this, +- df, pdfnName, (ULONG)NULL)); ++ df, pdfnName, 0)); + *ppStream = pstExp; + return S_OK; +@@ -1624,5 +1624,5 @@ + olMemTo(EH_pst, pstExp = new CExposedStream()); + olChkTo(EH_pstExp, pstExp->Init(pstDirect, this, +- df, pdfnName, (ULONG)NULL)); ++ df, pdfnName, 0)); + *ppStream = pstExp; + return S_OK; +--- oless/storage.cxx 2013-09-02 11:47:00.000000000 -0400 ++++ oless/storage.cxx 2018-01-20 20:03:24.664133000 -0500 +@@ -144,5 +144,5 @@ + + olChk(ValidateNameW(pwcsName, CBMAXPATHCOMPLEN)); +- olMem(pilb = new CFileILB(pwcsName, (DWORD)NULL, FALSE)); ++ olMem(pilb = new CFileILB(pwcsName, 0, FALSE)); + olChk(pilb->Open(STGM_READ)); + sc = GetScode( StgIsStorageILockBytes(pilb) ); |