Re: [Linphone-developers] migration to git

[Vadim Lebedev]

Ah... 
A pity you didn't choose mercurial (http://www.selenic.com/mercurial)
...  On Window git is a PITA.

Anyway i'm attaching a small patch for mscommon.c fixing issue with
PACKAGE_PLUGINS_DIR

Thanks
Vadim


Simon Morlat wrote:
> Hi lists,
>
> This mail is to inform you that the svn access to linphone's source code
> is now shutdown. A git access is in place instead.
> Also mediastreamer2 and oRTP subprojects have been changed as
> submodules, that is they have their own git repositories pointed from
> the main linphone git repository.
>
> The instructions are now:
>
> * Linphone anonymous access:
>
> git clone git://git.sv.nongnu.org/linphone.git --recursive
>
> (Don't ommit --recursive: this will automatically clone oRTP and
> mediastreamer2 subprojects).
>
>
> * mediastreamer2 anonymous access:
>
> git clone git://git.linphone.org/mediastreamer2.git
>
> * ortp anonymous access:
>
> git clone git://git.linphone.org/ortp.git
>
> We hope this decision will not generate too much frustration to svn
> supporters... However maintaining synchronisation between git and svn is
> a bit difficult and time consuming, especially when having multiple
> branches.
>
> Simon
>
>
>
>
>
> _______________________________________________
> Linphone-developers mailing list
> address@hidden
> http://lists.nongnu.org/mailman/listinfo/linphone-developers
>
>
>   

diff --git a/mediastreamer2/src/mscommon.c b/mediastreamer2/src/mscommon.c
--- a/mediastreamer2/src/mscommon.c
+++ b/mediastreamer2/src/mscommon.c
@@ -35,7 +35,7 @@
 #endif
 #ifndef WIN32
 #include <dirent.h>
-#else
+#endif
 #ifndef PACKAGE_PLUGINS_DIR
 #if defined(WIN32) || defined(_WIN32_WCE)
 #define PACKAGE_PLUGINS_DIR "plugins\\"
@@ -43,7 +43,6 @@
 #define PACKAGE_PLUGINS_DIR "."
 #endif
 #endif
-#endif
 #ifdef HAVE_DLOPEN
 #include <dlfcn.h>
 #endif