diff options
author | David <david@xagasoft.com> | 2007-06-19 06:05:55 +0000 |
---|---|---|
committer | David <david@xagasoft.com> | 2007-06-19 06:05:55 +0000 |
commit | 2b0fa89df615cb4789668014475ae64d99e773b5 (patch) | |
tree | 818d58faaf0e91530888284d75e6700d9097b1c7 /src | |
parent | 8a7fed8386c152023ddae611fe274b966287370a (diff) | |
download | libbu++-2b0fa89df615cb4789668014475ae64d99e773b5.tar.gz libbu++-2b0fa89df615cb4789668014475ae64d99e773b5.tar.bz2 libbu++-2b0fa89df615cb4789668014475ae64d99e773b5.tar.xz libbu++-2b0fa89df615cb4789668014475ae64d99e773b5.zip |
david - got some things compiling on win32 (wine/devc++)
Diffstat (limited to 'src')
-rw-r--r-- | src/file.cpp | 10 | ||||
-rw-r--r-- | src/file.h | 2 | ||||
-rw-r--r-- | src/tests/fstring.cpp | 10 |
3 files changed, 18 insertions, 4 deletions
diff --git a/src/file.cpp b/src/file.cpp index 368b788..1a8bd08 100644 --- a/src/file.cpp +++ b/src/file.cpp | |||
@@ -134,19 +134,21 @@ void Bu::File::setBlocking( bool bBlocking ) | |||
134 | return; | 134 | return; |
135 | } | 135 | } |
136 | 136 | ||
137 | #ifndef WIN32 | ||
137 | void Bu::File::truncate( long nSize ) | 138 | void Bu::File::truncate( long nSize ) |
138 | { | 139 | { |
139 | ftruncate( fileno( fh ), nSize ); | 140 | ftruncate( fileno( fh ), nSize ); |
140 | } | 141 | } |
141 | 142 | ||
142 | void Bu::File::flush() | 143 | void Bu::File::chmod( mode_t t ) |
143 | { | 144 | { |
144 | fflush( fh ); | 145 | fchmod( fileno( fh ), t ); |
145 | } | 146 | } |
147 | #endif | ||
146 | 148 | ||
147 | void Bu::File::chmod( mode_t t ) | 149 | void Bu::File::flush() |
148 | { | 150 | { |
149 | fchmod( fileno( fh ), t ); | 151 | fflush( fh ); |
150 | } | 152 | } |
151 | 153 | ||
152 | bool Bu::File::isOpen() | 154 | bool Bu::File::isOpen() |
@@ -47,6 +47,7 @@ namespace Bu | |||
47 | *@param sFlags (const char *) Standard file flags 'rb'... etc.. | 47 | *@param sFlags (const char *) Standard file flags 'rb'... etc.. |
48 | *@returns (Bu::File) A file object representing your temp file. | 48 | *@returns (Bu::File) A file object representing your temp file. |
49 | */ | 49 | */ |
50 | #ifndef WIN32 | ||
50 | inline static Bu::File tempFile( Bu::FString &sName, const char *sFlags ) | 51 | inline static Bu::File tempFile( Bu::FString &sName, const char *sFlags ) |
51 | { | 52 | { |
52 | int afh_d = mkstemp( sName.getStr() ); | 53 | int afh_d = mkstemp( sName.getStr() ); |
@@ -66,6 +67,7 @@ namespace Bu | |||
66 | *@param t (mode_t) The new file access permissions. | 67 | *@param t (mode_t) The new file access permissions. |
67 | */ | 68 | */ |
68 | void chmod( mode_t t ); | 69 | void chmod( mode_t t ); |
70 | #endif | ||
69 | 71 | ||
70 | private: | 72 | private: |
71 | FILE *fh; | 73 | FILE *fh; |
diff --git a/src/tests/fstring.cpp b/src/tests/fstring.cpp index d600be6..48dfc5f 100644 --- a/src/tests/fstring.cpp +++ b/src/tests/fstring.cpp | |||
@@ -3,12 +3,22 @@ | |||
3 | #include <sys/time.h> | 3 | #include <sys/time.h> |
4 | #include <string> | 4 | #include <string> |
5 | 5 | ||
6 | #ifndef WIN32 | ||
6 | inline double getTime() | 7 | inline double getTime() |
7 | { | 8 | { |
8 | struct timeval tv; | 9 | struct timeval tv; |
9 | gettimeofday( &tv, NULL ); | 10 | gettimeofday( &tv, NULL ); |
10 | return ((double)tv.tv_sec) + ((double)tv.tv_usec/1000000.0); | 11 | return ((double)tv.tv_sec) + ((double)tv.tv_usec/1000000.0); |
11 | } | 12 | } |
13 | #else | ||
14 | #include "windows.h" | ||
15 | #include "winbase.h" | ||
16 | inline double getTime() | ||
17 | { | ||
18 | uint32_t t = (uint32_t) GetTickCount(); | ||
19 | return (double) t / 1000.0; | ||
20 | } | ||
21 | #endif | ||
12 | 22 | ||
13 | Bu::FString genThing() | 23 | Bu::FString genThing() |
14 | { | 24 | { |