[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src common/defines.h traverso/widgets/...
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src common/defines.h traverso/widgets/... |
Date: |
Mon, 29 Dec 2008 20:49:39 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 08/12/29 20:49:39
Modified files:
src/common : defines.h
src/traverso/widgets: InfoWidgets.cpp
Log message:
* compile fix when cross compiling with mingw
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/common/defines.h?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.65&r2=1.66
Patches:
Index: common/defines.h
===================================================================
RCS file: /sources/traverso/traverso/src/common/defines.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- common/defines.h 30 Jan 2008 12:24:35 -0000 1.7
+++ common/defines.h 29 Dec 2008 20:49:38 -0000 1.8
@@ -365,7 +365,11 @@
#if defined(_MSC_VER) || defined(__MINGW32__)
-#include <Windows.h>
+#include <windows.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
static inline int gettimeofday(struct timeval* tp, void* tzp) {
DWORD t;
@@ -378,8 +382,13 @@
typedef uint8_t u_int8_t;
+#ifdef __cplusplus
+}
+#endif
+
#endif
+
static inline trav_time_t get_microseconds()
{
struct timeval now;
Index: traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- traverso/widgets/InfoWidgets.cpp 25 May 2008 20:14:47 -0000 1.65
+++ traverso/widgets/InfoWidgets.cpp 29 Dec 2008 20:49:39 -0000 1.66
@@ -42,7 +42,7 @@
#if defined (Q_WS_WIN)
-#include <Windows.h>
+#include <windows.h>
#elif defined (Q_WS_MAC)
#include <sys/param.h>
#include <sys/mount.h>
@@ -292,7 +292,7 @@
#if defined (Q_WS_WIN)
__int64 freebytestocaller, totalbytes, freebytes;
- if (! GetDiskFreeSpaceEx ((const
WCHAR*)(QS_C(m_project->get_root_dir())),
+ if (! GetDiskFreeSpaceEx ((const
CHAR*)(QS_C(m_project->get_root_dir())),
(PULARGE_INTEGER)&freebytestocaller,
(PULARGE_INTEGER)&totalbytes,
(PULARGE_INTEGER)&freebytes))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src common/defines.h traverso/widgets/...,
Remon Sijrier <=