Stephan Bergmann wrote:
[EMAIL PROTECTED] wrote:
User: vg Date: 2007-09-20 15:08:12+0000
Modified:
porting/sal/inc/sal/main.h
Log:
INTEGRATION: CWS os2port01 (1.6.64); FILE MERGED
2007/08/09 08:53:36 obr 1.6.64.3: RESYNC: (1.6-1.7); FILE MERGED
2007/01/02 17:39:38 ydario 1.6.64.2: Removed wrong code, left here by
accident.
2006/11/29 14:26:31 ydario 1.6.64.1: Initial OS/2 import.
File Changes:
Directory: /porting/sal/inc/sal/
================================
File [changed]: main.h
Url:
http://porting.openoffice.org/source/browse/porting/sal/inc/sal/main.h?r1=1.7&r2=1.8
Delta lines: +22 -0
--------------------
--- main.h 2006-12-01 17:24:31+0000 1.7
+++ main.h 2007-09-20 15:08:10+0000 1.8
@@ -108,6 +108,28 @@
}
#else /* ! SAL_W32 */
+
+#ifdef SAL_OS2
+
+int SAL_CALL osl_ProcessHook( int (*sal_main)( int, char**), int
argc, char ** argv);
+
+#define SAL_DEFINE_CRT_ENTRY() \
+int main(int argc, char ** argv) \
+{ \
+ return osl_ProcessHook(sal_main, argc, argv); \
+} \
+
+#else /* ! SAL_OS2 */
+
+#define SAL_DEFINE_CRT_ENTRY() \
+int main(int argc, char ** argv) \
+{ \
+ osl_setCommandArgs(argc, argv); \
+ return sal_main(argc, argv); \
+} \
SAL_DEFINE_CRT_ENTRY had been removed from main.h:1.7, so it looks
dubious that 1.8 re-introduces it for !(defined SAL_W32 || defined
SAL_OS2).
Yuri Dario wrote:
> Hi Stephan,
>
>> SAL_DEFINE_CRT_ENTRY had been removed from main.h:1.7, so it looks
>> dubious that 1.8 re-introduces it for !(defined SAL_W32 || defined
SAL_OS2).
>
> if this macro is no longer necessary, it may be removed safely.
Now, who wants to take care of this alleged merge error?
-Stephan
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
