Mercurial > mplayer.hg
comparison mplayer.c @ 30532:18b9a39a5bac
Add xscreensaver_heartbeat() declaration to x11_common.h.
This avoids a forward declaration in mplayer.c.
| author | diego |
|---|---|
| date | Sun, 14 Feb 2010 12:57:18 +0000 |
| parents | c5d1693acb35 |
| children | e3e329bc727a |
comparison
equal
deleted
inserted
replaced
| 30531:704903d34069 | 30532:18b9a39a5bac |
|---|---|
| 149 static int cfg_include(m_option_t *conf, char *filename){ | 149 static int cfg_include(m_option_t *conf, char *filename){ |
| 150 return m_config_parse_config_file(mconfig, filename); | 150 return m_config_parse_config_file(mconfig, filename); |
| 151 } | 151 } |
| 152 | 152 |
| 153 #include "get_path.h" | 153 #include "get_path.h" |
| 154 | |
| 155 //**************************************************************************// | |
| 156 // XScreensaver | |
| 157 //**************************************************************************// | |
| 158 | |
| 159 void xscreensaver_heartbeat(void); | |
| 160 | 154 |
| 161 //**************************************************************************// | 155 //**************************************************************************// |
| 162 //**************************************************************************// | 156 //**************************************************************************// |
| 163 // Input media streaming & demultiplexer: | 157 // Input media streaming & demultiplexer: |
| 164 //**************************************************************************// | 158 //**************************************************************************// |