[ros-diffs] [janderwald] 25059: - give roshttpd a rbuild file - include it in build - fix building with msvc
janderwald at svn.reactos.org
janderwald at svn.reactos.org
Mon Dec 4 00:35:03 CET 2006
Author: janderwald
Date: Mon Dec 4 02:35:02 2006
New Revision: 25059
URL: http://svn.reactos.org/svn/reactos?rev=25059&view=rev
Log:
- give roshttpd a rbuild file
- include it in build
- fix building with msvc
Added:
trunk/reactos/base/applications/network/roshttpd/roshttpd.rbuild (with props)
Modified:
trunk/reactos/base/applications/network/network.rbuild
trunk/reactos/base/applications/network/roshttpd/common/socket.cpp
trunk/reactos/base/applications/network/roshttpd/http.cpp
trunk/reactos/base/applications/network/roshttpd/include/config.h
trunk/reactos/base/applications/network/roshttpd/include/debug.h
trunk/reactos/base/applications/network/roshttpd/include/httpd.h
trunk/reactos/base/applications/network/roshttpd/include/socket.h
Modified: trunk/reactos/base/applications/network/network.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/network.rbuild?rev=25059&r1=25058&r2=25059&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/network.rbuild (original)
+++ trunk/reactos/base/applications/network/network.rbuild Mon Dec 4 02:35:02 2006
@@ -25,6 +25,9 @@
<directory name="route">
<xi:include href="route/route.rbuild" />
</directory>
+<directory name="roshttpd">
+ <xi:include href="roshttpd/roshttpd.rbuild" />
+</directory>
<directory name="telnet">
<xi:include href="telnet/telnet.rbuild" />
</directory>
Modified: trunk/reactos/base/applications/network/roshttpd/common/socket.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/roshttpd/common/socket.cpp?rev=25059&r1=25058&r2=25059&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/roshttpd/common/socket.cpp (original)
+++ trunk/reactos/base/applications/network/roshttpd/common/socket.cpp Mon Dec 4 02:35:02 2006
@@ -7,9 +7,9 @@
* REVISIONS:
* CSH 01/09/2000 Created
*/
+#include <socket.h>
#include <string.h>
#include <error.h>
-#include <socket.h>
#include <iterator.h>
// ***************************** CSocket *****************************
Modified: trunk/reactos/base/applications/network/roshttpd/http.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/roshttpd/http.cpp?rev=25059&r1=25058&r2=25059&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/roshttpd/http.cpp (original)
+++ trunk/reactos/base/applications/network/roshttpd/http.cpp Mon Dec 4 02:35:02 2006
@@ -12,7 +12,7 @@
* - Implement more entity-header entries
*/
#include <debug.h>
-#include <iostream.h>
+#include <iostream>
#include <string.h>
#include <http.h>
@@ -192,9 +192,6 @@
{
BOOL bStatus;
-
- CHAR ch;
-
if (RequestLine()) {
do {
if (!ReadString(sHeader, sizeof(sHeader)))
Modified: trunk/reactos/base/applications/network/roshttpd/include/config.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/roshttpd/include/config.h?rev=25059&r1=25058&r2=25059&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/roshttpd/include/config.h (original)
+++ trunk/reactos/base/applications/network/roshttpd/include/config.h Mon Dec 4 02:35:02 2006
@@ -6,8 +6,8 @@
#ifndef __CONFIG_H
#define __CONFIG_H
+#include <httpd.h>
#include <list.h>
-#include <httpd.h>
// General constants
#define APP_DESCRIPTION _T("ReactOS HTTP Daemon")
@@ -15,8 +15,8 @@
// Default configuration
#define dcfgDescription _T("Default configuration")
#define dcfgMainBase _T("C:\\roshttpd\\")
-#define dcfgHttpBase "C:\\roshttpd\\HttpBase\\"
-#define dcfgDefaultResource "index.html"
+#define dcfgHttpBase _T("C:\\roshttpd\\HttpBase\\")
+#define dcfgDefaultResource _T("index.html")
#define dcfgDefaultPort 80
class CConfig {
Modified: trunk/reactos/base/applications/network/roshttpd/include/debug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/roshttpd/include/debug.h?rev=25059&r1=25058&r2=25059&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/roshttpd/include/debug.h (original)
+++ trunk/reactos/base/applications/network/roshttpd/include/debug.h Mon Dec 4 02:35:02 2006
@@ -9,7 +9,7 @@
#include <stdio.h>
#ifdef DBG
-#define DPRINT(x...) printf(x)
+#define DPRINT(x, ...) printf(x)
#else
#define DPRINT(x...)
#endif
Modified: trunk/reactos/base/applications/network/roshttpd/include/httpd.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/roshttpd/include/httpd.h?rev=25059&r1=25058&r2=25059&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/roshttpd/include/httpd.h (original)
+++ trunk/reactos/base/applications/network/roshttpd/include/httpd.h Mon Dec 4 02:35:02 2006
@@ -6,8 +6,8 @@
#ifndef __HTTPD_H
#define __HTTPD_H
+#include <socket.h>
#include <thread.h>
-#include <socket.h>
#include <http.h>
#define HTTPD_START WM_USER + 1
Modified: trunk/reactos/base/applications/network/roshttpd/include/socket.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/roshttpd/include/socket.h?rev=25059&r1=25058&r2=25059&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/roshttpd/include/socket.h (original)
+++ trunk/reactos/base/applications/network/roshttpd/include/socket.h Mon Dec 4 02:35:02 2006
@@ -5,8 +5,7 @@
*/
#ifndef __SOCKET_H
#define __SOCKET_H
-#include <msvcrt/stdio.h>
-#include <windows.h>
+#include <stdio.h>
#include <winsock2.h>
#include <thread.h>
#include <list.h>
Added: trunk/reactos/base/applications/network/roshttpd/roshttpd.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/roshttpd/roshttpd.rbuild?rev=25059&view=auto
==============================================================================
--- trunk/reactos/base/applications/network/roshttpd/roshttpd.rbuild (added)
+++ trunk/reactos/base/applications/network/roshttpd/roshttpd.rbuild Mon Dec 4 02:35:02 2006
@@ -1,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<module name="roshttpd" type="win32cui" installbase="system32" installname="roshttpd.exe" stdlib="host">
+ <include base="roshttpd">include</include>
+ <define name="__USE_W32API" />
+ <define name="__USE_W32_SOCKETS" />
+ <define name="_WIN32_IE">0x600</define>
+ <define name="_WIN32_WINNT">0x501</define>
+ <library>kernel32</library>
+ <library>ws2_32</library>
+ <library>kernel32</library>
+ <file>config.cpp</file>
+ <file>error.cpp</file>
+ <file>http.cpp</file>
+ <file>httpd.cpp</file>
+ <file>roshttpd.cpp</file>
+ <directory name="common" >
+ <file>list.cpp</file>
+ <file>roshttpd.rc</file>
+ <file>socket.cpp</file>
+ <file>thread.cpp</file>
+ </directory>
+</module>
Propchange: trunk/reactos/base/applications/network/roshttpd/roshttpd.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
More information about the Ros-diffs
mailing list