Permalink
Browse files

zlib, bugfix: compile error on windows.

  • Loading branch information...
xicilion committed Oct 27, 2017
1 parent e96f23e commit 0334b8a3752efdbe59d18e6fe75662bad4e8bbd0
View
@@ -198,6 +198,7 @@
<ClInclude Include="include\XmlProcessingInstruction.h" />
<ClInclude Include="include\XmlText.h" />
<ClInclude Include="include\ZipFile.h" />
<ClInclude Include="include\ZlibStream.h" />
<ClInclude Include="include\ZmqSocket.h" />
<ClInclude Include="include\console.h" />
<ClInclude Include="include\date.h" />
@@ -357,7 +358,6 @@
<ClInclude Include="include\utf8.h" />
<ClInclude Include="include\utils.h" />
<ClInclude Include="include\version.h" />
<ClInclude Include="include\zlib.h" />
<ClInclude Include="src\db\sql\trans.h" />
<ClInclude Include="src\gui\windows\WebView.h" />
<ClInclude Include="src\process\process_hrtime.h" />
@@ -435,6 +435,9 @@
<ClInclude Include="include\ZipFile.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\ZlibStream.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\ZmqSocket.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -912,9 +915,6 @@
<ClInclude Include="include\version.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\zlib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\db\sql\trans.h">
<Filter>Source Files\db\sql</Filter>
</ClInclude>
View
@@ -198,6 +198,7 @@
<ClInclude Include="include\XmlProcessingInstruction.h" />
<ClInclude Include="include\XmlText.h" />
<ClInclude Include="include\ZipFile.h" />
<ClInclude Include="include\ZlibStream.h" />
<ClInclude Include="include\ZmqSocket.h" />
<ClInclude Include="include\console.h" />
<ClInclude Include="include\date.h" />
@@ -357,7 +358,6 @@
<ClInclude Include="include\utf8.h" />
<ClInclude Include="include\utils.h" />
<ClInclude Include="include\version.h" />
<ClInclude Include="include\zlib.h" />
<ClInclude Include="src\db\sql\trans.h" />
<ClInclude Include="src\gui\windows\WebView.h" />
<ClInclude Include="src\process\process_hrtime.h" />
@@ -435,6 +435,9 @@
<ClInclude Include="include\ZipFile.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\ZlibStream.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\ZmqSocket.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -912,9 +915,6 @@
<ClInclude Include="include\version.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\zlib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\db\sql\trans.h">
<Filter>Source Files\db\sql</Filter>
</ClInclude>
@@ -8,7 +8,7 @@
#include "ifs/WebSocket.h"
#include "ifs/ws.h"
#include "ifs/Stream.h"
#include "zlib.h"
#include "ZlibStream.h"
#ifndef WEBSOCKET_H_
#define WEBSOCKET_H_
@@ -1,5 +1,5 @@
/*
* zlib.h
* ZlibStream.h
*
* Created on: Oct 26, 2017
* Author: lion
@@ -10,8 +10,8 @@
#include "MemoryStream.h"
#include <zlib/include/zlib.h>
#ifndef __ZLIB_H_
#define __ZLIB_H_
#ifndef __ZLIBSTREAM_H_
#define __ZLIBSTREAM_H_
namespace fibjs {
@@ -366,4 +366,4 @@ class defraw : public def_base {
};
} /* namespace fibjs */
#endif /* __ZLIB_H_ */
#endif /* __ZLIBSTREAM_H_ */
View
@@ -508,6 +508,11 @@ result_t os_base::openPrinter(exlib::string name, obj_ptr<BufferedStream_base>&
return 0;
}
result_t flush(AsyncEvent* ac)
{
return 0;
}
result_t close(AsyncEvent* ac)
{
if (ac->isSync())
View
@@ -6,7 +6,7 @@
*/
#include "object.h"
#include "zlib.h"
#include "ZlibStream.h"
namespace fibjs {

0 comments on commit 0334b8a

Please sign in to comment.