From 47935539698bb53685f697adca557392e34b3619 Mon Sep 17 00:00:00 2001 From: Mateusz Poszwa Date: Wed, 11 May 2016 12:00:52 +0200 Subject: [PATCH] uTox-git: Update a patch --- uTox-git/distinfo | 2 +- uTox-git/patches/patch-src_main.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/uTox-git/distinfo b/uTox-git/distinfo index 55492f0591..1069b3def7 100644 --- a/uTox-git/distinfo +++ b/uTox-git/distinfo @@ -1,7 +1,7 @@ $NetBSD$ SHA1 (patch-Makefile) = 5dd6a6529616839179156aff2617c04b3f46ea1f -SHA1 (patch-src_main.h) = fa3881c6369ffe22244f0e74929ce0ae5ddcf5f6 +SHA1 (patch-src_main.h) = 1def46cb26e474b20a5e34ae5a471a7c9fbb004c SHA1 (patch-src_xlib_main.c) = 9ec90c640dd7603634593b3e00cba6714c955901 SHA1 (patch-src_xlib_v4l.c) = 159ac6e676c0361262daeb3f5324e4916b09b16a SHA1 (patch-src_xlib_video.c) = 4154194ba0d1a28f89a7bca9ce4004cc6064bdd1 diff --git a/uTox-git/patches/patch-src_main.h b/uTox-git/patches/patch-src_main.h index a2dd93c716..7aee249ca3 100644 --- a/uTox-git/patches/patch-src_main.h +++ b/uTox-git/patches/patch-src_main.h @@ -2,14 +2,14 @@ $NetBSD$ The volatile macro is used in {amd64,i386,machine}/mcontext.h on NetBSD. ---- src/main.h.orig 2016-03-21 09:05:38.000000000 +0000 +--- src/main.h.orig 2016-05-11 09:22:11.668807995 +0000 +++ src/main.h -@@ -33,7 +33,7 @@ - #define countof(x) (sizeof(x)/sizeof(*(x))) - +@@ -40,7 +40,7 @@ // fixes compile with apple headers + /*** This breaks both android and Windows video... but it's needed to fix complation in clang (Cocoa & asan) + *** TODO fix them? -#ifndef __OBJC__ -+#if !defined(__OBJC__) && !defined(__NetBSD__) ++##if !defined(__OBJC__) && !defined(__NetBSD__) #define volatile(x) (*((volatile typeof(x)*)&x)) - #endif + #endif */