Ticket #42158: patch-v3.diff

CMakeLists.txt

@@ -7 +7 @@
 # Version number
 set (libbiosig_VERSION_MAJOR 1)
 set (libbiosig_VERSION_MINOR 5)
-set (libbiosig_VERSION_PATCH 0)
+set (libbiosig_VERSION_PATCH 10)
 
 find_program (GAWK NAMES gawk)
 
@@ -23 +23 @@
   DEPENDS units.awk extern/units.csv
 )
 
+add_custom_target (annexb
+  COMMAND ${GAWK} -f annotatedECG.awk extern/11073-10102-AnnexB.txt > "11073-10102-AnnexB.i"
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  DEPENDS annotatedECG.awk extern/11073-10102-AnnexB.txt
+)
+
 set (headers
   t210/abfheadr.h
   XMLParser/tinyxml.h
@@ -61 +67 @@
   )
 endif ()
 
+if (APPLE)
+  list (APPEND sources
+    win32/getdelim.c
+    win32/getline.c
+  )
+endif ()
+
 # Cannot have same name for static and shared library, 
 # so we'll correct that later on
 add_library (biosigstatic STATIC
@@ -80 +93 @@
      )
 endif ()
 
-add_dependencies (biosigstatic eventcodes units)
-add_dependencies (biosigshared eventcodes units)
+add_dependencies (biosigstatic eventcodes units annexb)
+add_dependencies (biosigshared eventcodes units annexb)
 
 if (USE_ZLIB)
   add_definitions (-D=WITH_ZLIB)

win32/getdelim.c

@@ -19 +19 @@
 
 /* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
    optimizes away the lineptr == NULL || n == NULL || fp == NULL tests below.  */
+#if !defined(__linux__) && !defined(__OpenBSD__) && !(defined(__APPLE__) && __DARWIN_C_LEVEL >= 200809L)
+
 #define _GL_ARG_NONNULL(params)
 
 #include <stdio.h>
@@ -27 +29 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
+#if defined(__APPLE__) && __DARWIN_C_LEVEL < 200809L
+    #include <unistd.h>
+#endif
 
 #ifndef SSIZE_MAX
 # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
@@ -131 +136 @@
 
   return result;
 }
+#endif

win32/getline.c

@@ -16 +16 @@
 
 /* Written by Simon Josefsson. */
 
+#if !defined(__linux__) && !defined(__OpenBSD__) && !(defined(__APPLE__) && __DARWIN_C_LEVEL >= 200809L)
+
 #include <stdio.h>
+#if defined(__APPLE__) && __DARWIN_C_LEVEL < 200809L
+    #include <unistd.h>
+#endif
 
 ssize_t
 getline (char **lineptr, size_t *n, FILE *stream)
 {
   return getdelim (lineptr, n, '\n', stream);
 }
+#endif