[Libreoffice-commits] .: 3 commits - rsc/source tools/inc tools/source

[Thomas Arnhold]

 rsc/source/parser/rsclex.hxx    |    2 +-
 tools/inc/tools/inetdef.hxx     |   14 --------------
 tools/source/fsys/unx.cxx       |    4 ++--
 tools/source/stream/strmunx.cxx |    8 --------
 4 files changed, 3 insertions(+), 25 deletions(-)

New commits:
commit 0fa8890482057cd4feb88cc96d01551f9e3f5036
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Feb 15 22:18:11 2011 +0100

    Remove HP9000

diff --git a/rsc/source/parser/rsclex.hxx b/rsc/source/parser/rsclex.hxx
index f53f993..a16a232 100644
--- a/rsc/source/parser/rsclex.hxx
+++ b/rsc/source/parser/rsclex.hxx
@@ -105,7 +105,7 @@ class ObjectStack {
 extern "C" int yyparse();   // forward Deklaration fuer erzeugte Funktion
 extern "C" void yyerror( char * );
 extern "C" int  yylex( void );
-#elif defined( HP9000 ) || defined( SCO ) || defined ( SOLARIS )
+#elif defined( SCO ) || defined ( SOLARIS )
 extern "C" int yyparse();   // forward Deklaration fuer erzeugte Funktion
 extern "C" void yyerror( const char * );
 extern "C" int  yylex( void );
commit efb68812b19e1e697af56e0f687c4322d94c4590
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Feb 15 21:40:48 2011 +0100

    Remove unused and deprecated macros

diff --git a/tools/inc/tools/inetdef.hxx b/tools/inc/tools/inetdef.hxx
index 51c2179..2188c57 100644
--- a/tools/inc/tools/inetdef.hxx
+++ b/tools/inc/tools/inetdef.hxx
@@ -74,21 +74,9 @@
 #define TOOLS_INETDEF_OS "unknown OS"
 #endif // WN, ...
 
-#define TOOLS_INETDEF_PRODUCT "StarOffice/5.2"
-#define TOOLS_INETDEF_MOZILLA "Mozilla/3.0"
-
-#define INET_PRODUCTNAME TOOLS_INETDEF_PRODUCT " (" TOOLS_INETDEF_OS ")"
-#define INET_DEF_CALLERNAME TOOLS_INETDEF_MOZILLA " (compatible; "			 \
-     TOOLS_INETDEF_PRODUCT "; " TOOLS_INETDEF_OS ")"
-
 //============================================================================
 // The following definitions seem obsolete and might get removed in future.
 
-#define INET_PERS_CERT_HOMEPAGE "http://www.stardivision.de/certs.html"
-#define INET_PERS_CERT_HOMEPAGE_INT											 \
-     "http://www.stardivision.de/certs/certs##.html"
-    // the above definitions are only used in svx/source/options/optinet2.cxx
-
 #if defined __RSC
 #define INET_UNDEFINED 0
 #define INET_NAME_RESOLVE_START 1
commit 66dea8c7399e06ba90f386ca4edaf5043d3f45ee
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Feb 15 21:20:44 2011 +0100

    Remove SINIX

diff --git a/tools/inc/tools/inetdef.hxx b/tools/inc/tools/inetdef.hxx
index 89345f4..51c2179 100644
--- a/tools/inc/tools/inetdef.hxx
+++ b/tools/inc/tools/inetdef.hxx
@@ -67,8 +67,6 @@
 #define TOOLS_INETDEF_OS "DragonFly/i386"
 #elif defined DRAGONFLY && defined X86_64
 #define TOOLS_INETDEF_OS "DragonFly/amd64"
-#elif defined SINIX
-#define TOOLS_INETDEF_OS "SINIX"
 #else // AIX, HPUX, SOLARIS, ...
 #define TOOLS_INETDEF_OS "Unix"
 #endif // AIX, HPUX, SOLARIS, ...
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index 956faf8..9ae77c8 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -66,7 +66,7 @@ struct mnttab
 #include "comdep.hxx"
 #include <rtl/instance.hxx>
 
-#if defined SOLARIS || defined SINIX
+#if defined SOLARIS
 #define MOUNTSPECIAL mnt_special
 #define MOUNTPOINT 	 mnt_mountp
 #define MOUNTOPTS    mnt_mntopts
@@ -137,7 +137,7 @@ BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab)
 
 static BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab)
 {
-#if defined SOLARIS || defined SINIX
+#if defined SOLARIS
     FILE *fp = fopen (MNTTAB, "r");
     if (! fp)
         return FALSE;
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 7f65a36..ec9b20b 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -509,10 +509,6 @@ sal_Bool SvFileStream::LockRange( sal_Size nByteOffset, sal_Size nBytes )
         if ( errno == EINVAL || errno == ENOSYS )
             return sal_True;
     #endif
-    #if defined SINIX
-        if (errno == EINVAL)
-            return sal_True;
-    #endif
     #if defined SOLARIS
         if (errno == ENOSYS)
             return sal_True;
@@ -573,10 +569,6 @@ sal_Bool SvFileStream::UnlockRange( sal_Size nByteOffset, sal_Size nBytes )
         if ( errno == EINVAL || errno == ENOSYS )
             return sal_True;
 #endif
-#if ( defined SINIX )
-    if (errno == EINVAL)
-        return sal_True;
-#endif
 
     SetError( ::GetSvError( errno ));
     return sal_False;