Switch commoncpp2 to ucommon to solve dependency conflicts.
libccrtp was depending on commoncpp2, and have been replaced by a version
depending on ucommon as well.
diff --git a/jni/libzrtp/sources/common/osSpecifics.h b/jni/libzrtp/sources/common/osSpecifics.h
index 5030688..494dc0a 100644
--- a/jni/libzrtp/sources/common/osSpecifics.h
+++ b/jni/libzrtp/sources/common/osSpecifics.h
@@ -1,8 +1,8 @@
/*
- Copyright (C) 2012-2013 Werner Dittmann
+ Copyright (C) 2012 Werner Dittmann
This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
+ it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
@@ -34,23 +34,6 @@
* @author Werner Dittmann <Werner.Dittmann@t-online.de>
*/
-#ifndef __EXPORT
- #if (defined _WIN32 || defined __CYGWIN__) && defined(_DLL)
- #define __EXPORT __declspec(dllimport)
- #define __LOCAL
- #elif __GNUC__ >= 4
- #define __EXPORT __attribute__ ((visibility("default")))
- #define __LOCAL __attribute__ ((visibility("hidden")))
- #else
- #define __EXPORT
- #define __LOCAL
- #endif
-#endif
-
-#if defined(_WIN32) || defined(_WIN64)
-# define snprintf _snprintf
-#endif
-
#if defined(__cplusplus)
extern "C"
{