Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

GCC/G++ version 4.7 support #177

Merged
merged 1 commit into from

2 participants

@devkral

lightspark isn't compilable by gcc 4.7 because of some changes:
-spaces are necessary between "" and User-defined literals
-thread support is invisible
-this-> is necessary

In my commits is every problem I mentioned here fixed except the threadsupport-test which I deactivated.

@aajanki
Collaborator

Is _POSIX_THREAD_CPUTIME really gone or is it simply that unistd.h (which defines it according to the man page) is not anymore included automatically?

Can you also squeeze all changes into one commit, just to keep the log clean?

@devkral

Sorry, I didn't see the missing dependency to unistd.h even it is mentioned in the port guide^^.

@aajanki aajanki merged commit 016a35f into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 6, 2012
  1. @devkral
This page is out of date. Refresh to see the latest.
View
2  src/compat.cpp
@@ -22,6 +22,7 @@
#include <string>
#include <stdlib.h>
#include "logger.h"
+#include <unistd.h>
using namespace std;
@@ -73,6 +74,7 @@ uint64_t timespecToUsecs(timespec t)
uint64_t compat_get_thread_cputime_us()
{
timespec tp;
+
#ifndef _POSIX_THREAD_CPUTIME
#error no thread clock available
#endif
View
4 src/plugin/plugin.cpp
@@ -33,8 +33,8 @@
#define FAKE_MIME_TYPE "application/x-lightspark"
#define PLUGIN_NAME "Shockwave Flash"
#define FAKE_PLUGIN_NAME "Lightspark player"
-#define MIME_TYPES_DESCRIPTION MIME_TYPES_HANDLED":swf:"PLUGIN_NAME";"FAKE_MIME_TYPE":swfls:"FAKE_PLUGIN_NAME
-#define PLUGIN_DESCRIPTION "Shockwave Flash 11.1 r"SHORTVERSION
+#define MIME_TYPES_DESCRIPTION MIME_TYPES_HANDLED ":swf:" PLUGIN_NAME ";" FAKE_MIME_TYPE ":swfls:" FAKE_PLUGIN_NAME
+#define PLUGIN_DESCRIPTION "Shockwave Flash 11.1 r" SHORTVERSION
using namespace std;
using namespace lightspark;
View
2  src/scripting/class.h
@@ -409,7 +409,7 @@ class TemplatedClass : public Class<T>
ret->setClass(this);
ret->setTypes(types);
if(construct)
- handleConstruction(ret,args,argslen,true);
+ this->handleConstruction(ret,args,argslen,true);
return ret;
}
View
6 src/scripting/flash/system/flashsystem.cpp
@@ -38,12 +38,14 @@ REGISTER_CLASS_NAME(SecurityDomain);
REGISTER_CLASS_NAME(Capabilities);
REGISTER_CLASS_NAME(Security);
+
#ifdef _WIN32
-const char* Capabilities::EMULATED_VERSION = "WIN 11,1,0,"SHORTVERSION;
+const char* Capabilities::EMULATED_VERSION = "WIN 11,1,0," SHORTVERSION;
#else
-const char* Capabilities::EMULATED_VERSION = "LNX 11,1,0,"SHORTVERSION;
+const char* Capabilities::EMULATED_VERSION = "LNX 11,1,0," SHORTVERSION;
#endif
+
void Capabilities::sinit(Class_base* c)
{
c->setDeclaredMethodByQName("language","",Class<IFunction>::getFunction(_getLanguage),GETTER_METHOD,false);
Something went wrong with that request. Please try again.