i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't redefine DEBUG

Browse Source 
We use DEBUG as a #define when debug info is turned on. This conflics
with the use in WebAppInterface, so rename that as ENABLE_DEBUG (I can't
think of a better name for now).

Fixes the debug build.
This commit is contained in:
Adrien Destugues
2014-10-06 08:55:34 +02:00
parent 136884d011
commit cad9961409
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/haikudepot/model/WebAppInterface.cpp
+7 -7
View File
@@ -265,7 +265,7 @@ WebAppInterface::fRequestIndex = 0;
enum {
NEEDS_AUTHORIZATION = 1 << 0,
DEBUG = 1 << 1,
ENABLE_DEBUG = 1 << 1,
};
@@ -629,17 +629,17 @@ status_t
WebAppInterface::_SendJsonRequest(const char* domain, BString jsonString,
uint32 flags, BMessage& reply) const
{
if ((flags & DEBUG) != 0)
if ((flags & ENABLE_DEBUG) != 0)
printf("_SendJsonRequest(%s)\n", jsonString.String());
BString urlString("https://depot.haiku-os.org/api/v1/");
urlString << domain;
BUrl url(urlString);
ProtocolListener listener;
BUrlContext context;
BHttpHeaders headers;
BHttpHeaders headers;
headers.AddHeader("Content-Type", "application/json");
headers.AddHeader("User-Agent", "X-HDS-Client");
@@ -664,7 +664,7 @@ WebAppInterface::_SendJsonRequest(const char* domain, BString jsonString,
BMallocIO replyData;
listener.SetDownloadIO(&replyData);
listener.SetDebug((flags & DEBUG) != 0);
listener.SetDebug((flags & ENABLE_DEBUG) != 0);
thread_id thread = request.Run();
wait_for_thread(thread, NULL);
@@ -685,7 +685,7 @@ WebAppInterface::_SendJsonRequest(const char* domain, BString jsonString,
BJson parser;
status_t status = parser.Parse(reply, jsonString);
if ((flags & DEBUG) != 0 && status == B_BAD_DATA) {
if ((flags & ENABLE_DEBUG) != 0 && status == B_BAD_DATA) {
printf("Parser choked on JSON:\n%s\n", jsonString.String());
}
return status;