← Back to branch summary

~ubuntu-branches/ubuntu/lucid/vlc/lucid-security

« back to all changes in this revision

Viewing changes to src/modules/modules.h

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2009-09-25 14:44:17 UTC
  • mfrom: (3.5.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090925144417-87vomt575d0agvqa
Tags: 1.0.2-1ubuntu1
https://launchpad.net/bugs/435524
* Merge from Debian unstable (LP: #435524), remaining changes:
  - build against xulrunner-dev instead of iceape-dev
  - build against libx264-dev and install libx264 plugin
  - add Xb-Npp header to vlc package
  - recommend vlc-plugin-pulse for vlc

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/modules.h
2
2
 * modules.h : Module management functions.
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2001 the VideoLAN team
5
 
 * $Id: 00836dde077124bc8c537967396cab7afe549868 $
 
5
 * $Id: 252abe5b491faf8834a81bb569bf89a0f9d0a1cb $
6
6
 *
7
7
 * Authors: Samuel Hocevar <sam@zoy.org>
8
8
 *
76
76
#define MODULE_SHORTCUT_MAX 50
77
77
 
78
78
/* The module handle type. */
79
 
#if defined(HAVE_DL_DYLD)
 
79
#if defined(HAVE_DL_DYLD) && !defined(__x86_64__)
80
80
#   if defined (HAVE_MACH_O_DYLD_H)
81
81
#       include <mach-o/dyld.h>
82
82
#   endif