mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-14 00:43:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uncool/dvbsi++' commit 610ce926f5

Browse Source 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
This commit is contained in:
Stefan Seyfried
2012-12-30 21:35:20 +01:00
parent 0ee262ece5 a3d94d7962
commit 6e17b3f254
84 changed files with 898 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nhttpd/yhttpd.cpp
View File

@@ -34,28 +34,28 @@ CStringList Cyhttpd::ConfigList;
//=============================================================================
#ifdef Y_CONFIG_USE_AUTHHOOK
#include "mod_auth.h"
#include <mod_auth.h>
static CmAuth *auth = NULL;
#endif
#ifdef Y_CONFIG_USE_WEBLOG
#include "mod_weblog.h"
#include <mod_weblog.h>
static CmWebLog *weblog = NULL;
#endif
#ifdef Y_CONFIG_USE_SENDFILE
#include "mod_sendfile.h"
#include <mod_sendfile.h>
static CmodSendfile *mod_sendfile = NULL;
#endif
#ifdef Y_CONFIG_USE_CACHE
#include "mod_cache.h"
#include <mod_cache.h>
static CmodCache mod_cache; // static instance
#endif
//-----------------------------------------------------------------------------
#if defined(CONFIG_SYSTEM_TUXBOX) || defined(CONFIG_SYSTEM_TUXBOX_COOLSTREAM)
#include "neutrinoapi.h"
#include <neutrinoapi.h>
static CNeutrinoAPI *NeutrinoAPI;
#endif