From 4f0415e338862ffec50c2d47eddea958255b504e Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Thu, 25 Oct 2018 11:24:16 -0400
Subject: Feature/premake linux (#689)

* Premake work in progress for linux.

* Added dump function.

* Remove examples on linux
Small warning fix.

* * Don't build render-test on linux
* Removed work around virtual destructor warning, and just used virtual dtor for simplicity
* Git ignore obj directories

* Fix premake working on windows.

* * Fix sprintf_s functions
* Make generates arg parsing more robust

* Added FloatIntUnion to avoid type punning/strong aliasing issues, and repeated union definitions.

* Work around problems building on linux with getClass claiming a strict aliasing issue.

* Fix for targetBlock appearing potentiall used unintialized to gcc.

* Linux slang link options -fPIC to make dll.

* Add -fPIC to build options on linux.

* Add -ldl for linux on slang.

* Fixes to try and get premake working with .so on linux.

* Make core compile with -fPIC

* Try to fix linux linking with --no-as-needed before -ldl

* Add rpath back.

* Remove render-gl from linux build.

* Re-add location for linux.

* Don't include <malloc.h> except on windows.

* Remove unused line to fix warning on osx.

* Remove ambiguity on OSX for operator <<.

* Fixing ambiguity with operator overloading and Int types for OSX.

* Fix ambiguity around UInt and operator

* Fix ambiguity of UInt conversion for OSX.

* Added UnambiguousInt and UnambiguousUInt to make it easier to work around OSX integer coercion for UInt/Int types.
---
 source/core/stream.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source/core/stream.cpp')

diff --git a/source/core/stream.cpp b/source/core/stream.cpp
index b705b13a1..949ce718c 100644
--- a/source/core/stream.cpp
+++ b/source/core/stream.cpp
@@ -91,9 +91,9 @@ namespace Slang
 		default:
 			break;
 		}
-		int shFlag;
 #ifdef _WIN32
-		switch (share)
+        int shFlag = _SH_DENYRW;
+        switch (share)
 		{
 		case Slang::FileShare::None:
 			shFlag = _SH_DENYRW;
@@ -130,13 +130,13 @@ namespace Slang
 	}
 	Int64 FileStream::GetPosition()
 	{
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__CYGWIN__)
 		fpos_t pos;
 		fgetpos(handle, &pos);
 		return pos;
 #elif defined(__APPLE__)
 		return ftell(handle);
-#else
+#else 
 		fpos64_t pos;
 		fgetpos64(handle, &pos);
 		return *(Int64*)(&pos);
-- 
cgit v1.2.3