3 files changed, 20 insertions, 35 deletions

diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 0a3c5f566..61d00b732 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -17,7 +17,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: load_plugins.c,v 1.58 2001/11/25 13:31:24 miguelfreitas Exp $
+ * $Id: load_plugins.c,v 1.59 2001/11/30 00:53:51 f1rmb Exp $
  *
  *
  * Load input/demux/audio_out/video_out/codec plugins
@@ -45,10 +45,7 @@
 #include "metronom.h"
 #include "configfile.h"
 #include "xineutils.h"
-
-#ifndef	__GNUC__
-#define	__FUNCTION__	__func__
-#endif
+#include "compat.h"
 
 /*
 #define LOAD_LOG
@@ -93,7 +90,7 @@ void load_demux_plugins (xine_t *this,
 
   if(this == NULL || config == NULL) {
     printf("%s(%s@%d): parameter should be non null, exiting\n",
-	   __FILE__, __FUNCTION__, __LINE__);
+	   __FILE__, __XINE_FUNCTION__, __LINE__);
     exit(1);
   }
 
@@ -343,7 +340,7 @@ static char **_xine_get_featured_input_plugin_ids(xine_t *this, int feature) {
       plugin_ids[n] = (char *) malloc (strlen(ip->get_identifier(ip)) + 1 );
       strcpy (plugin_ids[n], ip->get_identifier(ip));
       /* printf("%s(%d): %s is featured\n",  */
-      /*        __FUNCTION__, feature, ip->get_identifier(ip)); */
+      /*        __XINE_FUNCTION__, feature, ip->get_identifier(ip)); */
       n++;
     }
 
@@ -416,7 +413,7 @@ void load_decoder_plugins (xine_t *this,
 
   if(this == NULL || config == NULL) {
     printf("%s(%s@%d): parameter should be non null, exiting\n",
-	   __FILE__, __FUNCTION__, __LINE__);
+	   __FILE__, __XINE_FUNCTION__, __LINE__);
     exit(1);
   }
 
@@ -667,7 +664,7 @@ char **xine_list_video_output_plugins (int visual_type) {
     }
   } else {
     fprintf(stderr, "load_plugins: %s - cannot access plugin dir: %s",
-	    __FUNCTION__, strerror(errno));
+	    __XINE_FUNCTION__, strerror(errno));
   }
   
   remove_segv_handler();
@@ -856,7 +853,7 @@ char **xine_list_audio_output_plugins(void) {
     }
   } else {
     fprintf (stderr, "load_plugins: %s - cannot access plugin dir: %s",
-	     __FUNCTION__, strerror(errno));
+	     __XINE_FUNCTION__, strerror(errno));
   }
   
   remove_segv_handler();
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index aaad50a63..96b550275 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -40,26 +40,14 @@
 #define LOG_DEBUG 1
 */
 
-#ifdef DEBUG
-
-# ifdef	__GNUC__
-#  define LOG(lvl, fmt...)	fprintf (stderr, fmt);
-# else
-#  define LOG(lvl, ...)		fprintf (stderr, __VA_ARGS__);
-# endif
-
-#else /* !DEBUG */
-
-# ifdef __GNUC__
-#  define LOG(lvl, fmt...)
-# else
-#  define LOG(lvl, ...)
-# endif
-
-#endif /* !DEBUG */
-
-
+#ifdef MAX
+#undef MAX
+#endif
 #define MAX(a,b) ( (a) > (b) ) ? (a) : (b)
+
+#ifdef MIN
+#undef MIN
+#endif
 #define MIN(a,b) ( (a) < (b) ) ? (a) : (b)
 
 /*
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index f15eed2eb..2efb52cc2 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -17,7 +17,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: xine.c,v 1.81 2001/11/28 22:19:12 miguelfreitas Exp $
+ * $Id: xine.c,v 1.82 2001/11/30 00:53:51 f1rmb Exp $
  *
  * top-level xine functions
  *
@@ -53,10 +53,7 @@
 #include "osd.h"
 
 #include "xineutils.h"
-
-#ifndef	__GNUC__
-#define	__FUNCTION__	__func__
-#endif
+#include "compat.h"
 
 void * xine_notify_stream_finished_thread (void * this_gen) {
   xine_t *this = this_gen;
@@ -161,7 +158,7 @@ static int try_demux_with_stages(xine_t *this, const char *MRL,
 
   if(stages[0] == -1) {
     fprintf(stderr, "%s(%d) wrong first stage = %d !!\n", 
-	    __FUNCTION__, __LINE__, stage1);
+	    __XINE_FUNCTION__, __LINE__, stage1);
     return 0;
   }
 
@@ -435,6 +432,8 @@ xine_t *xine_init (vo_driver_t *vo,
 
   this->video_out = vo_new_instance (vo, this->metronom);
   video_decoder_init (this);
+
+#ifdef USE_OSD
   this->osd_renderer = osd_renderer_init( this->video_out->overlay_source );
   osd_renderer_load_font( this->osd_renderer, "vga" ); 
   
@@ -447,6 +446,7 @@ xine_t *xine_init (vo_driver_t *vo,
     osd_set_position(osd,10,10);
     osd_show(osd,0);
   }
+#endif
   
   if(ao) 
     this->audio_out = ao_new_instance (ao, this->metronom, config);