summaryrefslogtreecommitdiff
path: root/src/input/libdvdnav/dvdnav_internal.h
diff options
context:
space:
mode:
authorJames Courtier-Dutton <jcdutton@users.sourceforge.net>2003-04-29 15:58:27 +0000
committerJames Courtier-Dutton <jcdutton@users.sourceforge.net>2003-04-29 15:58:27 +0000
commit12018188e9317c2092a3e12db8672b25b1e4bbad (patch)
treeb8767c519dacf4b3ed86688070cb56dfd6923c7d /src/input/libdvdnav/dvdnav_internal.h
parenta23c0fad73df02e6419a01a1c07923876c3e8436 (diff)
downloadxine-lib-12018188e9317c2092a3e12db8672b25b1e4bbad.tar.gz
xine-lib-12018188e9317c2092a3e12db8672b25b1e4bbad.tar.bz2
Update from the libdvdnav project.
CVS patchset: 4708 CVS date: 2003/04/29 15:58:27
Diffstat (limited to 'src/input/libdvdnav/dvdnav_internal.h')
-rw-r--r--src/input/libdvdnav/dvdnav_internal.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/input/libdvdnav/dvdnav_internal.h b/src/input/libdvdnav/dvdnav_internal.h
index 40783a95b..c71b5aed6 100644
--- a/src/input/libdvdnav/dvdnav_internal.h
+++ b/src/input/libdvdnav/dvdnav_internal.h
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dvdnav_internal.h,v 1.9 2003/03/29 13:19:09 mroi Exp $
+ * $Id: dvdnav_internal.h,v 1.10 2003/04/29 15:58:30 jcdutton Exp $
*
*/
@@ -166,12 +166,19 @@ struct dvdnav_s {
#ifdef __GNUC__
#define printerrf(format, args...) snprintf(this->err_str, MAX_ERR_LEN, format, ## args);
#else
+#ifdef _MSC_VER
+#define printerrf(str) snprintf(this->err_str, MAX_ERR_LEN, str);
+#else
#define printerrf(...) snprintf(this->err_str, MAX_ERR_LEN, __VA_ARGS__);
+#endif /* WIN32 */
#endif
#define printerr(str) strncpy(this->err_str, str, MAX_ERR_LEN);
/* Save my typing */
#define S_ERR DVDNAV_STATUS_ERR
+
+#ifndef _MSC_VER
#define S_OK DVDNAV_STATUS_OK
+#endif /* MSC_VER */
#endif /* DVDNAV_INTERNAL_H_INCLUDED */