Merge from default ENGINE-74
authorKrista Grothoff <krista@pep-project.org>
Wed, 23 Nov 2016 20:59:05 +0100
branchENGINE-74
changeset 1430c4d6e7afbc57
parent 1429 86c0e9def29c
parent 1425 74ee50b89619
child 1431 66ddf4c4274f
Merge from default
src/pEpEngine.h
     1.1 --- a/README-OSX.md	Wed Nov 23 20:54:28 2016 +0100
     1.2 +++ b/README-OSX.md	Wed Nov 23 20:59:05 2016 +0100
     1.3 @@ -6,6 +6,9 @@
     1.4  
     1.5  `export LANG=en_US.UTF-8` is recommended on OS X.
     1.6  
     1.7 +`export DYLD_FALLBACK_LIBRARY_PATH=$HOME/lib:/opt/local/lib` will help if you
     1.8 +build in your home and with MacPorts.
     1.9 +
    1.10  ## Dependencies
    1.11  
    1.12  ### MacPorts
     2.1 --- a/src/Makefile	Wed Nov 23 20:54:28 2016 +0100
     2.2 +++ b/src/Makefile	Wed Nov 23 20:59:05 2016 +0100
     2.3 @@ -8,7 +8,7 @@
     2.4  TARGET?=libpEpEngine.dylib
     2.5  MACOSX_VERSION_MIN=10.6
     2.6  GPGME_IN=$(HOME)
     2.7 -LIBGPGME?=libgpgme-pthread.dylib
     2.8 +LIBGPGME?=libgpgme.dylib
     2.9  CC?=clang -std=c99 -pthread
    2.10  LD?=clang
    2.11  CFLAGS?=-I$(GPGME_IN)/include -I$(HOME)/include -I/opt/local/include $(OPTIMIZE) -pedantic \
     3.1 --- a/src/pEpEngine.h	Wed Nov 23 20:54:28 2016 +0100
     3.2 +++ b/src/pEpEngine.h	Wed Nov 23 20:59:05 2016 +0100
     3.3 @@ -592,7 +592,7 @@
     3.4  DYNAMIC_API PEP_STATUS set_identity_flags(
     3.5          PEP_SESSION session,
     3.6          pEp_identity *identity,
     3.7 -        unsigned int flags
     3.8 +        identity_flags_t flags
     3.9      );
    3.10  
    3.11  // unset_identity_flags() - update identity flags on existing identity
    3.12 @@ -612,7 +612,7 @@
    3.13  DYNAMIC_API PEP_STATUS unset_identity_flags(
    3.14          PEP_SESSION session,
    3.15          pEp_identity *identity,
    3.16 -        unsigned int flags
    3.17 +        identity_flags_t flags
    3.18      );
    3.19  
    3.20  // mark_as_compromized() - mark key in trust db as compromized