[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - include/osl

Aron Budea aron.budea at collabora.com
Thu Feb 22 13:55:18 UTC 2018


 include/osl/file.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c8bb752d21e25a1ba9b61e1197002e6d8c1746a5
Author: Aron Budea <aron.budea at collabora.com>
Date:   Wed Feb 21 14:49:11 2018 +0100

    tdf#115383: revert mixup of E_ROFS and E_SPIPE in file.hxx
    
    Regression from a9739f2dec197793fa9400dd95be49494dc85264
    
    Change-Id: I1b55b0201888a63bd2439be8c0421f450d609018
    Reviewed-on: https://gerrit.libreoffice.org/50105
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/50171
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index b005a31b5e76..96c155a18e1e 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -80,8 +80,8 @@ public:
         E_NOTTY        = osl_File_E_NOTTY,          //< inappropriate I/O control operation
         E_FBIG         = osl_File_E_FBIG,           //< file too large
         E_NOSPC        = osl_File_E_NOSPC,          //< no space left on device, write failed
-        E_SPIPE        = osl_File_E_ROFS,           //< invalid seek operation (such as on pipe)
-        E_ROFS         = osl_File_E_SPIPE,          //< illegal modification to read-only filesystem
+        E_SPIPE        = osl_File_E_SPIPE,          //< invalid seek operation (such as on pipe)
+        E_ROFS         = osl_File_E_ROFS,           //< illegal modification to read-only filesystem
         E_MLINK        = osl_File_E_MLINK,          //< too many links to file
         E_PIPE         = osl_File_E_PIPE,           //< broken pipe; no process reading from other end of pipe
         E_DOM          = osl_File_E_DOM,            //< domain error (mathematical error)


More information about the Libreoffice-commits mailing list