← Back to branch summary

~ubuntu-branches/ubuntu/karmic/mplayer/karmic

« back to all changes in this revision

Viewing changes to loader/wine/pshpack2.h

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-06-06 23:01:52 UTC
  • mfrom: (0.1.6 squeeze) (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20090606230152-qxn13xfnq65nz088
Tags: 2:1.0~rc3+svn20090426-1ubuntu1
https://launchpad.net/bugs/336697
https://launchpad.net/bugs/260918
https://launchpad.net/bugs/246675
https://launchpad.net/bugs/243453
https://launchpad.net/bugs/74282
https://launchpad.net/bugs/308939
https://launchpad.net/bugs/73271
https://launchpad.net/bugs/347021
* Switch to debian packaging for the mplayer package
* New upstream release, LP: #336697, #260918, #246675, #243453, #74282
* Fixes security issues: CVE-2008-5616, LP: #308939
* many flv fixes LP: #73271, #347021
* Build and install mencoder
* Bump epoch

Show diffs side-by-side

added added

removed removed

Lines of Context:
loader/wine/pshpack2.h
1
 
#ifndef WINE_PSHPACK_H
2
 
#define WINE_PSHPACK_H 2
 
1
#ifndef MPLAYER_PSHPACK_H
 
2
#define MPLAYER_PSHPACK_H 2
3
3
 
4
4
#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
5
5
//#pragma pack(2)
7
7
#error "2 as alignment isn't supported by the compiler"
8
8
#endif /* defined(__GNUC__) || defined(__SUNPRO_CC) ; !defined(RC_INVOKED) */
9
9
 
10
 
#else /* !defined(WINE_PSHPACK_H) */
 
10
#else /* MPLAYER_PSHPACK_H */
11
11
#error "Nested pushing of alignment isn't supported by the compiler"
12
 
#endif /* !defined(WINE_PSHPACK_H) */
 
12
#endif /* MPLAYER_PSHPACK_H */