Commit 25c56aea authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

misc/darwin_specific.c: Fix compilation where MAXPATHLEN isn't defined. Fix a bunch of warnings.

parent 52a3a73f
...@@ -40,6 +40,10 @@ ...@@ -40,6 +40,10 @@
# include <mach-o/dyld.h> # include <mach-o/dyld.h>
#endif #endif
#ifndef MAXPATHLEN
# define MAXPATHLEN 1024
#endif
/* CFLocaleCopyAvailableLocaleIdentifiers is present only on post-10.4 */ /* CFLocaleCopyAvailableLocaleIdentifiers is present only on post-10.4 */
extern CFArrayRef CFLocaleCopyAvailableLocaleIdentifiers(void) __attribute__((weak_import)); extern CFArrayRef CFLocaleCopyAvailableLocaleIdentifiers(void) __attribute__((weak_import));
...@@ -75,18 +79,18 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] ) ...@@ -75,18 +79,18 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
char i_dummy; char i_dummy;
char *p_char = NULL; char *p_char = NULL;
char *p_oldchar = &i_dummy; char *p_oldchar = &i_dummy;
int i; unsigned int i;
/* Get the full program path and name */ /* Get the full program path and name */
/* First try to see if we are linked to the framework */ /* First try to see if we are linked to the framework */
for (i = 0; i < _dyld_image_count(); i++) for (i = 0; i < _dyld_image_count(); i++)
{ {
char * psz_img_name = _dyld_get_image_name(i); const char * psz_img_name = _dyld_get_image_name(i);
/* Check for "VLCKit.framework/Versions/Current/VLCKit", /* Check for "VLCKit.framework/Versions/Current/VLCKit",
* as well as "VLCKit.framework/Versions/A/VLCKit" and * as well as "VLCKit.framework/Versions/A/VLCKit" and
* "VLC.framework/Versions/B/VLCKit" */ * "VLC.framework/Versions/B/VLCKit" */
if( p_char = strstr( psz_img_name, "VLCKit.framework/Versions/" )) if( (p_char = strstr( psz_img_name, "VLCKit.framework/Versions/" )) )
{ {
/* Look for the next forward slash */ /* Look for the next forward slash */
p_char += 26; /* p_char += strlen(" VLCKit.framework/Versions/" ) */ p_char += 26; /* p_char += strlen(" VLCKit.framework/Versions/" ) */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment