mirror of
https://github.com/glest/glest-source.git
synced 2025-08-22 07:52:51 +02:00
Preparing for refactoring
This commit is contained in:
@@ -1,19 +0,0 @@
|
||||
// ==============================================================
|
||||
// This file is part of MegaGlest (www.megaglest.org)
|
||||
//
|
||||
// Copyright (C) 2012 Mark Vejvoda
|
||||
//
|
||||
// You can redistribute this code and/or modify it under
|
||||
// the terms of the GNU General Public License as published
|
||||
// by the Free Software Foundation; either version 2 of the
|
||||
// License, or (at your option) any later version
|
||||
// ==============================================================
|
||||
|
||||
#include "byte_order.h"
|
||||
|
||||
namespace Shared {
|
||||
namespace PlatformByteOrder {
|
||||
|
||||
|
||||
}
|
||||
};
|
@@ -629,4 +629,3 @@ UPNP_GetIGDFromUrl(const char * rootdescurl,
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -571,4 +571,3 @@ miniwget_getaddr(const char * url, int * size,
|
||||
#endif
|
||||
return miniwget2(hostname, port, path, size, addr, addrlen, scope_id);
|
||||
}
|
||||
|
||||
|
@@ -190,5 +190,3 @@ void parsexml(struct xmlparser * parser) {
|
||||
parser->xmlend = parser->xmlstart + parser->xmlsize;
|
||||
parseelt(parser);
|
||||
}
|
||||
|
||||
|
||||
|
@@ -152,4 +152,3 @@ int testxmlparser(const char * xml, int size) {
|
||||
printf("minixml validation test failed\n");
|
||||
return r;
|
||||
}*/
|
||||
|
||||
|
@@ -1,13 +1,23 @@
|
||||
// ==============================================================
|
||||
// This file is part of Glest Shared Library (www.glest.org)
|
||||
// This file is part of ZetaGlest <https://github.com/ZetaGlest>
|
||||
//
|
||||
// Copyright (C) 2005 Matthias Braun <matze@braunis.de>
|
||||
// Copyright (C) 2018 The ZetaGlest team
|
||||
//
|
||||
// You can redistribute this code and/or modify it under
|
||||
// the terms of the GNU General Public License as published
|
||||
// by the Free Software Foundation; either version 2 of the
|
||||
// License, or (at your option) any later version
|
||||
// ==============================================================
|
||||
// ZetaGlest is a fork of MegaGlest <https://megaglest.org>
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>
|
||||
|
||||
#ifndef _WIN32
|
||||
|
||||
#include "factory_repository.h"
|
||||
|
||||
@@ -42,3 +52,5 @@ SoundFactory *FactoryRepository::getSoundFactory(const string &name) {
|
||||
}
|
||||
|
||||
}}//end namespace
|
||||
|
||||
#endif
|
||||
|
@@ -1,18 +1,37 @@
|
||||
// ==============================================================
|
||||
//This file is part of Glest Shared Library (www.glest.org)
|
||||
//Copyright (C) 2005 Matthias Braun <matze@braunis.de>
|
||||
// This file is part of ZetaGlest <https://github.com/ZetaGlest>
|
||||
//
|
||||
// Copyright (C) 2018 The ZetaGlest team
|
||||
//
|
||||
// ZetaGlest is a fork of MegaGlest <https://megaglest.org>
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>
|
||||
|
||||
#ifndef _WIN32
|
||||
|
||||
//You can redistribute this code and/or modify it under
|
||||
//the terms of the GNU General Public License as published by the Free Software
|
||||
//Foundation; either version 2 of the License, or (at your option) any later
|
||||
//version.
|
||||
#include "platform_util.h"
|
||||
#include <iostream>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include "util.h"
|
||||
#include "conversion.h"
|
||||
|
||||
#if defined(WIN32) || defined(_WIN32)
|
||||
#define popen _popen
|
||||
#define pclose _pclose
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
// For gcc backtrace on crash!
|
||||
#if defined(HAS_GCC_BACKTRACE)
|
||||
|
||||
@@ -347,3 +366,5 @@ megaglest_runtime_error::megaglest_runtime_error(const string& __arg,bool noStac
|
||||
}
|
||||
|
||||
}}//end namespace
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user