Merge from 1.2.

1 files changed, 5 insertions, 10 deletions

diff --git a/include/xine.h b/include/xine.h
index da1d394a3..17b8cfbf6 100644
--- a/include/xine.h
+++ b/include/xine.h
@@ -55,12 +55,7 @@ extern "C" {
 #include <windowsx.h>
 #endif
 
-#ifdef XINE_COMPILE
-#include <inttypes.h>
-#else
 #include <xine/os_types.h>
-#endif
-
 #include <xine/attributes.h>
 #include <xine/version.h>
 
@@ -712,14 +707,14 @@ void xine_post_dispose(xine_t *xine, xine_post_t *self) XINE_PROTECTED;
 /* defines a single parameter entry. */
 typedef struct {
   int              type;             /* POST_PARAM_TYPE_xxx             */
-  char            *name;             /* name of this parameter          */
+  const char      *name;             /* name of this parameter          */
   int              size;             /* sizeof(parameter)               */
   int              offset;           /* offset in bytes from struct ptr */
   char           **enum_values;      /* enumeration (first=0) or NULL   */
   double           range_min;        /* minimum value                   */
   double           range_max;        /* maximum value                   */
   int              readonly;         /* 0 = read/write, 1=read-only     */
-  char            *description;      /* user-friendly description       */
+  const char      *description;      /* user-friendly description       */
 } xine_post_api_parameter_t;
 
 /* description of parameters struct (params). */
@@ -1340,9 +1335,9 @@ typedef struct {
 struct xine_health_check_s {
   const char* cdrom_dev;
   const char* dvd_dev;
-  char*       msg;
-  char*       title;
-  char*       explanation;
+  const char* msg;
+  const char* title;
+  const char* explanation;
   int         status;
 };