Attachment #6703 for issue #12442

View | Details | Raw Unified | Return to issue 12442
Collapse All | Expand All

Lines 982-986 Link Here

(-)inc/action.hxx (-1 / +1 lines)
982	};	982	};
983		983
984		984
985	#endif __ACTION_HXX	985	#endif // __ACTION_HXX
986		986

Lines 304-310 Link Here

(-)source/compiler/decltor.cxx (-1 / +1 lines)
304	m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SOLSG \|\|	304	m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SOLSG \|\|
305	m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SOLIG \|\|	305	m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SOLIG \|\|
306	m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_LINUX \|\|	306	m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_LINUX \|\|
307	m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_FREEBSD \|\|	307	// m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_FREEBSD \|\|
308	m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_HP \|\|	308	m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_HP \|\|
309	m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SCO;	309	m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SCO;
310	}	310	}




		aExtension = "UNIX_SOLIG";
	else if( eType == OSType_UNIX_LINUX )
		aExtension = "UNIX_LINUX";
//	else if( eType == OSType_UNIX_FREEBSD )
//		aExtension = "UNIX_FREEBSD";
	else if( eType == OSType_UNIX_HP )
		aExtension = "UNIX_HP";
	else if( eType == OSType_UNIX_SCO )

	readOSConfiguration( OSType_UNIX_SOLSG );
	readOSConfiguration( OSType_UNIX_SOLIG );
	readOSConfiguration( OSType_UNIX_LINUX );
//	readOSConfiguration( OSType_UNIX_FREEBSD );
	readOSConfiguration( OSType_UNIX_HP );
	readOSConfiguration( OSType_UNIX_SCO );
	fprintf( stdout, "\n" );

			case OSType_UNIX_SOLSG:
			case OSType_UNIX_SOLIG:
			case OSType_UNIX_LINUX:
//			case OSType_UNIX_FREEBSD:
			case OSType_UNIX_HP:
			case OSType_UNIX_SCO:
				return ByteString(UNX_README_FILE_NAME);

			case OSType_UNIX_SOLSG:
			case OSType_UNIX_SOLIG:
			case OSType_UNIX_LINUX:
//			case OSType_UNIX_FREEBSD:
			case OSType_UNIX_HP:
			case OSType_UNIX_SCO:
				return ByteString(UNX_LICENSE_FILE_NAME);

Return to issue 12442

Lines 126-133 Link Here

(-)source/service/interface.cxx (-5 / +5 lines)
126	aExtension = "UNIX_SOLIG";	126	aExtension = "UNIX_SOLIG";
127	else if( eType == OSType_UNIX_LINUX )	127	else if( eType == OSType_UNIX_LINUX )
128	aExtension = "UNIX_LINUX";	128	aExtension = "UNIX_LINUX";
129	else if( eType == OSType_UNIX_FREEBSD )	129	// else if( eType == OSType_UNIX_FREEBSD )
130	aExtension = "UNIX_FREEBSD";	130	// aExtension = "UNIX_FREEBSD";
131	else if( eType == OSType_UNIX_HP )	131	else if( eType == OSType_UNIX_HP )
132	aExtension = "UNIX_HP";	132	aExtension = "UNIX_HP";
133	else if( eType == OSType_UNIX_SCO )	133	else if( eType == OSType_UNIX_SCO )
Lines 240-246 Link Here
240	readOSConfiguration( OSType_UNIX_SOLSG );	240	readOSConfiguration( OSType_UNIX_SOLSG );
241	readOSConfiguration( OSType_UNIX_SOLIG );	241	readOSConfiguration( OSType_UNIX_SOLIG );
242	readOSConfiguration( OSType_UNIX_LINUX );	242	readOSConfiguration( OSType_UNIX_LINUX );
243	readOSConfiguration( OSType_UNIX_FREEBSD );	243	// readOSConfiguration( OSType_UNIX_FREEBSD );
244	readOSConfiguration( OSType_UNIX_HP );	244	readOSConfiguration( OSType_UNIX_HP );
245	readOSConfiguration( OSType_UNIX_SCO );	245	readOSConfiguration( OSType_UNIX_SCO );
246	fprintf( stdout, "\n" );	246	fprintf( stdout, "\n" );
Lines 580-586 Link Here
580	case OSType_UNIX_SOLSG:	580	case OSType_UNIX_SOLSG:
581	case OSType_UNIX_SOLIG:	581	case OSType_UNIX_SOLIG:
582	case OSType_UNIX_LINUX:	582	case OSType_UNIX_LINUX:
583	case OSType_UNIX_FREEBSD:	583	// case OSType_UNIX_FREEBSD:
584	case OSType_UNIX_HP:	584	case OSType_UNIX_HP:
585	case OSType_UNIX_SCO:	585	case OSType_UNIX_SCO:
586	return ByteString(UNX_README_FILE_NAME);	586	return ByteString(UNX_README_FILE_NAME);
Lines 603-609 Link Here
603	case OSType_UNIX_SOLSG:	603	case OSType_UNIX_SOLSG:
604	case OSType_UNIX_SOLIG:	604	case OSType_UNIX_SOLIG:
605	case OSType_UNIX_LINUX:	605	case OSType_UNIX_LINUX:
606	case OSType_UNIX_FREEBSD:	606	// case OSType_UNIX_FREEBSD:
607	case OSType_UNIX_HP:	607	case OSType_UNIX_HP:
608	case OSType_UNIX_SCO:	608	case OSType_UNIX_SCO:
609	return ByteString(UNX_LICENSE_FILE_NAME);	609	return ByteString(UNX_LICENSE_FILE_NAME);