author | zecke <zecke> | 2002-10-04 21:16:03 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-04 21:16:03 (UTC) |
commit | 10048c2dd7f7cd26c582d64b5e255b00b47de304 (patch) (unidiff) | |
tree | 3b2a79d8218efe5f80d1b2e79e77b22cbc27c2ba | |
parent | dc0344e987ba9b386056dd7bab7c5e34922eff5c (diff) | |
download | opie-10048c2dd7f7cd26c582d64b5e255b00b47de304.zip opie-10048c2dd7f7cd26c582d64b5e255b00b47de304.tar.gz opie-10048c2dd7f7cd26c582d64b5e255b00b47de304.tar.bz2 |
Weird for some of you
_OS_LINUX_ does not get defined
so now it's a if !define(_OS_LINUX)
but this means you need to libuuid again
I don't know how to fix that right. I should ask tt
-rw-r--r-- | core/launcher/transferserver.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index a20df2f..f9204ab 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp | |||
@@ -89,5 +89,11 @@ namespace { | |||
89 | QString uuid(); | 89 | QString uuid(); |
90 | }; | 90 | }; |
91 | #if defined(_OS_LINUX_) | 91 | #if !defined(_OS_LINUX_) |
92 | QString UidGen::uuid() { | ||
93 | uuid_t uuid; | ||
94 | uuid_generate( uuid ); | ||
95 | return QUUid( uuid ).toString(); | ||
96 | } | ||
97 | #else | ||
92 | /* | 98 | /* |
93 | * linux got a /proc/sys/kernel/random/uuid file | 99 | * linux got a /proc/sys/kernel/random/uuid file |
@@ -103,10 +109,4 @@ namespace { | |||
103 | return "{" + stream.read().stripWhiteSpace() + "}"; | 109 | return "{" + stream.read().stripWhiteSpace() + "}"; |
104 | } | 110 | } |
105 | #else | ||
106 | QString UidGen::uuid() { | ||
107 | uuid_t uuid; | ||
108 | uuid_generate( uuid ); | ||
109 | return QUUid( uuid ).toString(); | ||
110 | } | ||
111 | #endif | 111 | #endif |
112 | } | 112 | } |