X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvlc_epg.h;h=26141ac158100a0f38114ad7a209d62b4a40ff85;hb=6a66117a34f627ad9560b07cead07663b48f23b6;hp=58e4d9588fd41c12cad01849faaeb8f86da80f53;hpb=6ee1e193fd896ab9a4729fde14f009d9ce629815;p=vlc

diff --git a/include/vlc_epg.h b/include/vlc_epg.h
index 58e4d9588f..26141ac158 100644
--- a/include/vlc_epg.h
+++ b/include/vlc_epg.h
@@ -2,7 +2,7 @@
  * vlc_epg.h: Electronic Program Guide
  *****************************************************************************
  * Copyright (C) 2007 the VideoLAN team
- * $Id: vlc_meta.h 18214 2006-12-03 13:48:21Z zorglub $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -21,10 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
 #ifndef _VLC_EPG_H
 #define _VLC_EPG_H 1
 
@@ -60,17 +56,13 @@ static inline void vlc_epg_Clean( vlc_epg_t *p_epg )
     for( i = 0; i < p_epg->i_event; i++ )
     {
         vlc_epg_event_t *p_evt = p_epg->pp_event[i];
-        if( p_evt->psz_name )
-            free( p_evt->psz_name );
-        if( p_evt->psz_short_description )
-            free( p_evt->psz_short_description );
-        if( p_evt->psz_description )
-            free( p_evt->psz_description );
+        free( p_evt->psz_name );
+        free( p_evt->psz_short_description );
+        free( p_evt->psz_description );
         free( p_evt );
     }
     TAB_CLEAN( p_epg->i_event, p_epg->pp_event );
-    if( p_epg->psz_name )
-        free( p_epg->psz_name );
+    free( p_epg->psz_name );
 }
 static inline void vlc_epg_AddEvent( vlc_epg_t *p_epg, int64_t i_start, int i_duration,
                                 const char *psz_name, const char *psz_short_description, const char *psz_description )