Author: rmottola
Date: Tue Feb 16 23:42:59 2016
New Revision: 39384
URL: http://svn.gna.org/viewcvs/gnustep?rev=39384&view=rev
Log:
add solaris special case
Modified:
libs/gui/trunk/Source/NSWorkspace.m
libs/gui/trunk/Tools/GNUmakefile.preamble
Modified: libs/gui/trunk/Source/NSWorkspace.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSWorkspace.m?rev=39384&r1=39383&r2=39384&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSWorkspace.m (original)
+++ libs/gui/trunk/Source/NSWorkspace.m Tue Feb 16 23:42:59 2016
@@ -1183,7 +1183,7 @@
non-standard f_basetype field, which provides the name of the
underlying file system type.
*/
-#if defined (__NetBSD__) && __NetBSD_Version__ >= 300000000
+#if (defined (__NetBSD__) && __NetBSD_Version__ >= 300000000) ||
(defined(__sun__) && defined(__svr4__))
#define statfs statvfs
#define f_flags f_flag
#endif
@@ -1232,6 +1232,9 @@
*fileSystemType = @"NFS";
else
*fileSystemType = @"Other";
+#elif defined(__sun__)
+ *fileSystemType =
+ [[NSString alloc] initWithCString: m.f_basetype encoding: enc];
#else
*fileSystemType =
[[NSString alloc] initWithCString: m.f_fstypename encoding: enc];
Modified: libs/gui/trunk/Tools/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Tools/GNUmakefile.preamble?rev=39384&r1=39383&r2=39384&view=diff
==============================================================================
--- libs/gui/trunk/Tools/GNUmakefile.preamble (original)
+++ libs/gui/trunk/Tools/GNUmakefile.preamble Tue Feb 16 23:42:59 2016
@@ -26,7 +26,7 @@
-I../Source/$(GNUSTEP_TARGET_DIR)
# Additional LDFLAGS to pass to the linker
-# ADDITIONAL_LDFLAGS +=
+ADDITIONAL_LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib -R/opt/csw/gcc4/lib
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR)
-L../Model/$(GNUSTEP_OBJ_DIR)
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
