Mercurial > mplayer.hg

annotate loader/wine/pshpack4.h @ 34979:93a763f04563

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug with definition of IDPLAYDISK in Win32 GUI. Numeric identifiers starting from IDPLAYDISK are used for CDROM/DVD drive menu entries and there must be enough identifier for all drives available. Introduce IDPLAYDISK_LIMIT for a range of such identifiers. Additionally, add a check when creating menu entries and rework the condition for checking the play command for reasons of clarity. Reported by Stephen Sheldon, sfsheldo gmail com.
author ib
date Sat, 11 Aug 2012 13:02:58 +0000
parents 32725ca88fed
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26045
a8ea87c71d18 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25548
diff changeset
1 #ifndef MPLAYER_PSHPACK_H
a8ea87c71d18 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25548
diff changeset
2 #define MPLAYER_PSHPACK_H 4
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4 #if defined(__GNUC__) || defined(__SUNPRO_CC)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
5 //#pragma pack(4)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
6 #elif defined(__SUNPRO_C)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
7 //#pragma pack()
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
8 #elif !defined(RC_INVOKED)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
9 #error "4 as alignment isn't supported by the compiler"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
10 #endif /* defined(__GNUC__) || defined(__SUNPRO_CC) ; !defined(RC_INVOKED) */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
11
26045
a8ea87c71d18 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25548
diff changeset
12 #else /* MPLAYER_PSHPACK_H */
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
13 #error "Nested pushing of alignment isn't supported by the compiler"
26045
a8ea87c71d18 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25548
diff changeset
14 #endif /* MPLAYER_PSHPACK_H */