[Bug 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.documentfoundation.org/show_bug.cgi?id=82579 jan iversen changed: What|Removed |Added Whiteboard|target:4.4.0|ToBeReviewed -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.documentfoundation.org/show_bug.cgi?id=82579 --- Comment #9 from Fernando Montes --- I don't know. I don't really understand what the bug really is. I understand its about types conflicting with each other. But much like you said I can't think of a clear way to do it not using a wrapper. I even talked to my professor about it. The only thing he could think of was making a namespace for the conflicting types. But would that be any cleaner then headers? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.documentfoundation.org/show_bug.cgi?id=82579 --- Comment #8 from Tor Lillqvist --- What made you think this bug has anything to do with performance? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.documentfoundation.org/show_bug.cgi?id=82579 --- Comment #7 from Fernando Montes --- Well i am going to try to do what is left of this. Hopefully i can get ride of both headers. Though i doubt getting rid of them will improve performance by much. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82579 --- Comment #6 from Tor Lillqvist --- Or we could just say that having premac.h/postmac.h is not that bad after all and close this bug as WONTFIX. After all, the above approach at least is hardly any cleaner... -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82579 Stephan Bergmann changed: What|Removed |Added CC||sberg...@redhat.com --- Comment #5 from Stephan Bergmann --- (In reply to Tor Lillqvist from comment #3) > I guess handling TimeValue will be problematic here, as it is defined in a > stable API header, . > > OK to break API (and ABI?) by renaming TimeValue there to OslTimeValue? Even though certainly very poor choice of non-prefixed name in osl/time.h, it would be better if we can work around the issue without breaking API (as outlined in your patch). -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82579 --- Comment #4 from Tor Lillqvist --- Forgot the quartz/hide-osl-timevalue.h, would be something like this. (But the above was just one test approach, not sure at all that it is sane.) #define TimeValue OslTimeValue #include #include #include #include #include #include #undef TimeValue -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82579
--- Comment #3 from Tor Lillqvist ---
I guess handling TimeValue will be problematic here, as it is defined in a
stable API header, .
OK to break API (and ABI?) by renaming TimeValue there to OslTimeValue?
Or is something more complicated needed to hide the osl TimeValue in those
(relatively few?) source files that include both the and Mac and
iOS system headers? A start of an attempt at that would be as below:
diff --git a/include/postmac.h b/include/postmac.h
index a0cc11b..b489d67 100644
--- a/include/postmac.h
+++ b/include/postmac.h
@@ -21,6 +21,5 @@
#undef Point
#undef Polygon
#undef Size
-#undef TimeValue
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/premac.h b/include/premac.h
index f22c193..ee201c9 100644
--- a/include/premac.h
+++ b/include/premac.h
@@ -21,6 +21,5 @@
#define Point MacOSPoint
#define Polygon MacOSPolygon
#define Size MacOSSize
-#define TimeValue MacOSTimeValue
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index 8a88a26..2a3032d 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -20,6 +20,8 @@
#ifndef INCLUDED_VCL_INC_OSX_SALINST_H
#define INCLUDED_VCL_INC_OSX_SALINST_H
+#include "quartz/hide-osl-timevalue.h"
+
#include "comphelper/solarmutex.hxx"
#include "osl/thread.hxx"
#include "osl/conditn.h"
diff --git a/vcl/osx/a11ycomponentwrapper.mm b/vcl/osx/a11ycomponentwrapper.mm
index b91029d..5a2d52a 100644
--- a/vcl/osx/a11ycomponentwrapper.mm
+++ b/vcl/osx/a11ycomponentwrapper.mm
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "quartz/hide-osl-timevalue.h"
+
#include "quartz/utils.h"
#include "a11ycomponentwrapper.h"
#include "a11yrolehelper.h"
diff --git a/vcl/osx/a11yfactory.mm b/vcl/osx/a11yfactory.mm
index 30437a8..3437565 100644
--- a/vcl/osx/a11yfactory.mm
+++ b/vcl/osx/a11yfactory.mm
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "osx/salinst.h"
#include "osx/a11yfactory.h"
#include "osx/a11yfocustracker.hxx"
diff --git a/vcl/osx/a11yrolehelper.mm b/vcl/osx/a11yrolehelper.mm
index 45423db..2e1aee3 100644
--- a/vcl/osx/a11yrolehelper.mm
+++ b/vcl/osx/a11yrolehelper.mm
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "quartz/hide-osl-timevalue.h"
#include "osx/a11yfactory.h"
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index e2db4c3..35fc28a 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -19,6 +19,8 @@
#include "sal/config.h"
+#include "quartz/hide-osl-timevalue.h"
+
#include "tools/resary.hxx"
#include "vcl/print.hxx"
diff --git a/vcl/osx/printview.mm b/vcl/osx/printview.mm
index 8b324b9..498e9ed 100644
--- a/vcl/osx/printview.mm
+++ b/vcl/osx/printview.mm
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "quartz/hide-osl-timevalue.h"
#include "vcl/print.hxx"
diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index f4dc179..0a94673 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -19,6 +19,8 @@
#include
+#include "quartz/hide-osl-timevalue.h"
+
#include "osx/saldata.hxx"
#include "osx/salnsmenu.h"
#include "osx/salinst.h"
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 8e74086..fbedacf 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "quartz/hide-osl-timevalue.h"
+
#include
#include
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index d8adf03..8223214 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -21,6 +21,8 @@
#include
+#include "quartz/hide-osl-timevalue.h"
+
#include
#include "osl/process.h"
@@ -665,7 +667,7 @@ void AquaSalInstance::Yield( bool bWait, bool
bHandleAllCurrentEvents )
// wait until any thread (most likely the main thread)
// has dispatched an event, cop out at 200 ms
osl_resetCondition( maWaitingYieldCond );
-TimeValue aVal = { 0, 2 };
+OslTimeValue aVal = { 0, 2 };
sal_uLong nCount = ReleaseYieldMutex();
osl_waitCondition( maWaitingYieldCond, &aVal );
AcquireYieldMutex( nCount );
diff --git a/vcl/osx/salsys.cxx b/vcl/osx/salsys.cxx
index f10ba61..b75d249 100644
--- a/vcl/osx/salsys.cxx
+++ b/vcl/osx/salsys.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "quartz/hide-osl-timevalue.h"
+
#include "rtl/ustrbuf.hxx"
#include "vcl/button.hxx"
diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx
index 17c4d80..ff3fd49 100644
--- a/vcl/osx/saltimer.cxx
+++ b/vcl/osx/saltimer.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
[Bug 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82579 --- Comment #2 from Commit Notification --- Tor Lillqvist committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=95a5d7733190d66b1c4761a5bbaa5a2cc2361dd0 fdo#82579: The SDK used by the "TDF" tb needs Cursor and Line to be handled The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82579 Commit Notification changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp TopicCleanup |SkillCpp TopicCleanup ||target:4.4.0 --- Comment #1 from Commit Notification --- Tor Lillqvist committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=c2d3b7e4aa0480ed2c66b7240ef05cfff6a07125 fdo#82579: Only Point, Polygon, Size and TimeValue need to be handled The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82579 Michael Stahl changed: What|Removed |Added Whiteboard||EasyHack DifficultyBeginner ||SkillCpp TopicCleanup -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
