Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

Conflicts:
	src/nhttpd/yhttpd.cpp
This commit is contained in:
[CST] Bas
2012-12-07 14:39:05 +08:00
96 changed files with 960 additions and 461 deletions

View File

@@ -34,22 +34,22 @@ 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