Fixed some compilation problems introduced in 2.4.1b. Added Mac execu…

…table.
alexdobin · Apr 24, 2015 · 6416af7 · 6416af7
1 parent 3b3e6ec
commit 6416af7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,8 @@
+STAR 2.4.1c 2015/04/24
+Fixed some compilation problems introduced in 2.4.1b.
+Added Mac executable.
+
+
 STAR 2.4.1b 2015/04/23
 Fixed a bug introduced in 2.4.1a causing serious problems for genomes generated without annotations.
       If you generated a genome without annotations with 2.4.1a please re-generate it.

diff --git a/bin/MacOSX_x86_64/STAR b/bin/MacOSX_x86_64/STAR
diff --git a/source/SharedMemory.cpp b/source/SharedMemory.cpp
@@ -11,6 +11,11 @@
 #include <semaphore.h>
 #include <errno.h>
 
+#ifdef COMPILE_FOR_MAC
+  //some Mac's idiosyncrasies: standard SHM libraries are very old and missing some definitions
+  #define SHM_NORESERVE 0
+#endif
+
 using namespace std;
 
 SharedMemory::SharedMemory(key_t key, bool unloadLast): _key(key), _counterKey(key+1), _unloadLast(unloadLast), _err(&cerr)
@@ -282,4 +287,4 @@ int SharedMemory::SharedObjectsUseCount()
     }
     else
         return -1;
-}
+}
diff --git a/source/Transcriptome_quantAlign.cpp b/source/Transcriptome_quantAlign.cpp
@@ -64,7 +64,8 @@ int alignToTranscript(Transcript &aG, uint trS1, uint8 trStr1, uint32 *exSE1, ui
                 for (uint32 iex=0; iex<aT.nExons; iex++) 
                 {//no junctions in the transcritomic coordinates
                     aT.sjAnnot[iex]=0;
-                    aT.shiftSJ[iex]={0,0};
+                    aT.shiftSJ[iex][0]=0;
+                    aT.shiftSJ[iex][1]=0;
                     aT.sjStr[iex]=0;
                 };
 

diff --git a/source/VERSION b/source/VERSION
@@ -1 +1 @@
-#define STAR_VERSION "STAR_2.4.1b"
+#define STAR_VERSION "STAR_2.4.1c"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define STAR_VERSION "STAR_2.4.1b"
		#define STAR_VERSION "STAR_2.4.1c"