Merge branch 'remove-explicit-dependency-on-libssp' into 'master'

Remove explicit dependency on libssp

See merge request cairo/cairo!360

meson.build

@@ -69,7 +69,7 @@ if cc.get_id() != 'msvc'
   ]
 
   if get_option('optimization') in ['1', '2', '3']
-    cflags += ['-Wp,-D_FORTIFY_SOURCE=2', '-Wl,-lssp']
+    cflags += '-Wp,-D_FORTIFY_SOURCE=2'
   endif
 
   supported_cflags = cc.get_supported_arguments(cflags)

perf/cairo-perf-graph-files.c

@@ -30,9 +30,12 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <errno.h>
+
+#ifdef G_OS_UNIX
+#include <unistd.h>
 #include <fcntl.h>
+#endif
 
 #include <cairo.h>
 
@@ -232,6 +235,8 @@ show_case_toggled (GtkCellRendererToggle *cell,
     graph_view_update_visible ((GraphView *) app->gv);
 }
 
+#ifdef G_OS_UNIX
+
 static gboolean
 git_read (GIOChannel	   *io,
 	  GIOCondition	    cond,
@@ -300,6 +305,8 @@ do_git (struct _app_data  *app,
     g_io_add_watch (app->git_io, G_IO_IN | G_IO_HUP, (GIOFunc) git_read, app);
 }
 
+#endif
+
 static void
 gv_report_selected (GraphView	     *gv,
 		    int 	      i,
@@ -327,7 +334,11 @@ gv_report_selected (GraphView	     *gv,
 	argv[3] = id;
 	argv[4] = NULL;
 
+#ifdef G_OS_UNIX
 	do_git (app, argv);
+#else
+        g_print ("id: %s\n", id);
+#endif
 	g_free (id);
     }
 }