Fixed compile errors with sfRenderWindow and sfImage in CSFML
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1004 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
laurentgom
parent
c3687b4018
commit
f044357031
47 changed files with 398 additions and 391 deletions
|
|
@ -30,6 +30,7 @@
|
|||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Config.h>
|
||||
#include <SFML/Network/IPAddress.h>
|
||||
#include <SFML/Network/Types.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
|
|
@ -110,16 +111,6 @@ enum sfFtpStatus
|
|||
};
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// sfFtpListingResponse wraps a FTP directory listing response,
|
||||
/// which is basically :
|
||||
/// - a status code
|
||||
/// - a message
|
||||
/// - a list of directory and files
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef struct sfFtpListingResponse sfFtpListingResponse;
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Destroy an existing Ftp listing response
|
||||
///
|
||||
|
|
@ -180,16 +171,6 @@ CSFML_API size_t sfFtpListingResponse_GetCount(sfFtpListingResponse* FtpListingR
|
|||
////////////////////////////////////////////////////////////
|
||||
CSFML_API const char* sfFtpListingResponse_GetFilename(sfFtpListingResponse* FtpListingResponse, size_t Index);
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// sfFtpDirectoryResponse wraps a FTP directory response, which is basically :
|
||||
/// - a status code
|
||||
/// - a message
|
||||
/// - a directory name
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef struct sfFtpDirectoryResponse sfFtpDirectoryResponse;
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Destroy an existing Ftp directory response
|
||||
///
|
||||
|
|
@ -240,14 +221,6 @@ CSFML_API const char* sfFtpDirectoryResponse_GetMessage(sfFtpDirectoryResponse*
|
|||
CSFML_API const char* sfFtpDirectoryResponse_GetDirectory(sfFtpDirectoryResponse* FtpDirectoryResponse);
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// sfFtpResponse wraps a FTP response, which is basically :
|
||||
/// - a status code
|
||||
/// - a message
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef struct sfFtpResponse sfFtpResponse;
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Destroy an existing Ftp response
|
||||
///
|
||||
|
|
@ -287,16 +260,6 @@ CSFML_API sfFtpStatus sfFtpResponse_GetStatus(sfFtpResponse* FtpResponse);
|
|||
////////////////////////////////////////////////////////////
|
||||
CSFML_API const char* sfFtpResponse_GetMessage(sfFtpResponse* FtpResponse);
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// sfFtp provides methods for manipulating the FTP
|
||||
/// protocol (described in RFC 959).
|
||||
/// It provides easy access and transfers to remote
|
||||
/// directories and files on a FTP server
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef struct sfFtp sfFtp;
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Construct a new Ftp
|
||||
///
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
// Headers
|
||||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Config.h>
|
||||
#include <SFML/Network/Types.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
|
|
@ -78,14 +79,6 @@ enum sfHttpStatus
|
|||
};
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// sfHttpRequest wraps an HTTP request, which is basically :
|
||||
/// - a header with a method, a target URI, and a set of field/value pairs
|
||||
/// - an optional body (for POST requests)
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef struct sfHttpRequest sfHttpRequest;
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Construct a new Http request
|
||||
///
|
||||
|
|
@ -154,15 +147,6 @@ CSFML_API void sfHttpRequest_SetHttpVersion(sfHttpRequest* HttpRequest, unsigned
|
|||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfHttpRequest_SetBody(sfHttpRequest* HttpRequest, const char* Body);
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// sfHttpResponse wraps an HTTP response, which is basically :
|
||||
/// - a header with a status code and a set of field/value pairs
|
||||
/// - a body (the content of the requested resource)
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef struct sfHttpResponse sfHttpResponse;
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Destroy an existing Http response
|
||||
///
|
||||
|
|
@ -226,15 +210,6 @@ CSFML_API unsigned int sfHttpResponse_GetMinorVersion(sfHttpResponse* HttpRespon
|
|||
////////////////////////////////////////////////////////////
|
||||
CSFML_API const char* sfHttpResponse_GetBody(sfHttpResponse* HttpResponse);
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// sfHttp provides methods for manipulating the HTTP
|
||||
/// protocol (described in RFC 1945).
|
||||
/// It can connect to a website, get its files, send requests, etc.
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef struct sfHttp sfHttp;
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Construct a new Http object
|
||||
///
|
||||
|
|
|
|||
|
|
@ -29,12 +29,7 @@
|
|||
// Headers
|
||||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Config.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// sfPacket wraps data to send / to receive through the network
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef struct sfPacket sfPacket;
|
||||
#include <SFML/Network/Types.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -29,16 +29,7 @@
|
|||
// Headers
|
||||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Config.h>
|
||||
#include <SFML/Network/SocketTCP.h>
|
||||
#include <SFML/Network/SocketUDP.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// sfSelectorTCP and sfSelectorUDP allow reading from multiple sockets
|
||||
/// without blocking. It's a kind of multiplexer
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef struct sfSelectorTCP sfSelectorTCP;
|
||||
typedef struct sfSelectorUDP sfSelectorUDP;
|
||||
#include <SFML/Network/Types.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -30,15 +30,8 @@
|
|||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Config.h>
|
||||
#include <SFML/Network/IPAddress.h>
|
||||
#include <SFML/Network/Packet.h>
|
||||
#include <SFML/Network/SocketStatus.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// SocketTCP wraps a socket using TCP protocol to
|
||||
/// send data safely (but a bit slower)
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef struct sfSocketTCP sfSocketTCP;
|
||||
#include <SFML/Network/Types.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -30,15 +30,8 @@
|
|||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Config.h>
|
||||
#include <SFML/Network/IPAddress.h>
|
||||
#include <SFML/Network/Packet.h>
|
||||
#include <SFML/Network/SocketStatus.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// sfSocketUDP wraps a socket using UDP protocol to
|
||||
/// send data fastly (but with less safety)
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef struct sfSocketUDP sfSocketUDP;
|
||||
#include <SFML/Network/Types.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
43
CSFML/include/SFML/Network/Types.h
Normal file
43
CSFML/include/SFML/Network/Types.h
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
////////////////////////////////////////////////////////////
|
||||
//
|
||||
// SFML - Simple and Fast Multimedia Library
|
||||
// Copyright (C) 2007-2008-2008 Laurent Gomila (laurent.gom@gmail.com)
|
||||
//
|
||||
// This software is provided 'as-is', without any express or implied warranty.
|
||||
// In no event will the authors be held liable for any damages arising from the use of this software.
|
||||
//
|
||||
// Permission is granted to anyone to use this software for any purpose,
|
||||
// including commercial applications, and to alter it and redistribute it freely,
|
||||
// subject to the following restrictions:
|
||||
//
|
||||
// 1. The origin of this software must not be misrepresented;
|
||||
// you must not claim that you wrote the original software.
|
||||
// If you use this software in a product, an acknowledgment
|
||||
// in the product documentation would be appreciated but is not required.
|
||||
//
|
||||
// 2. Altered source versions must be plainly marked as such,
|
||||
// and must not be misrepresented as being the original software.
|
||||
//
|
||||
// 3. This notice may not be removed or altered from any source distribution.
|
||||
//
|
||||
////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef SFML_NETWORK_TYPES_H
|
||||
#define SFML_NETWORK_TYPES_H
|
||||
|
||||
|
||||
typedef struct sfFtpDirectoryResponse sfFtpDirectoryResponse;
|
||||
typedef struct sfFtpListingResponse sfFtpListingResponse;
|
||||
typedef struct sfFtpResponse sfFtpResponse;
|
||||
typedef struct sfFtp sfFtp;
|
||||
typedef struct sfHttpRequest sfHttpRequest;
|
||||
typedef struct sfHttpResponse sfHttpResponse;
|
||||
typedef struct sfHttp sfHttp;
|
||||
typedef struct sfPacket sfPacket;
|
||||
typedef struct sfSelectorTCP sfSelectorTCP;
|
||||
typedef struct sfSelectorUDP sfSelectorUDP;
|
||||
typedef struct sfSocketTCP sfSocketTCP;
|
||||
typedef struct sfSocketUDP sfSocketUDP;
|
||||
|
||||
|
||||
#endif // SFML_NETWORK_TYPES_H
|
||||
Loading…
Add table
Add a link
Reference in a new issue