celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [2/2] celix git commit: CELIX-387: Updating travis to use xcode 8.2.
Date Thu, 12 Jan 2017 11:52:02 GMT
CELIX-387: Updating travis to use xcode 8.2.


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/2de5fb46
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/2de5fb46
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/2de5fb46

Branch: refs/heads/develop
Commit: 2de5fb4647e1319ec6d4446ab86996e6e11d19c7
Parents: 4c68a18
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Thu Jan 12 12:56:50 2017 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Thu Jan 12 12:56:50 2017 +0100

----------------------------------------------------------------------
 .travis.yml                            | 1 +
 framework/private/src/bundle_archive.c | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/2de5fb46/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 66564e3..3d988bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 
 sudo: required
 dist: trusty
+osx_image: xcode8.2
 
 language: c
 

http://git-wip-us.apache.org/repos/asf/celix/blob/2de5fb46/framework/private/src/bundle_archive.c
----------------------------------------------------------------------
diff --git a/framework/private/src/bundle_archive.c b/framework/private/src/bundle_archive.c
index 889fd4b..3d0513d 100644
--- a/framework/private/src/bundle_archive.c
+++ b/framework/private/src/bundle_archive.c
@@ -28,15 +28,7 @@
 #include <string.h>
 #include <time.h>
 #include <sys/stat.h>
-
-#ifdef __APPLE__
-//FIXME: compiling using travix and max osx is giving compile error for unknown type name
 '__darwin_pthread_mutex_t'
-//including pthread.h to remove compile error
-#include <pthread.h>
-#endif
-
 #include <dirent.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "bundle_archive.h"


Mime
View raw message