[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [2799] Fixed some problems under windows.
From: |
Giuseppe Scrivano |
Subject: |
[myserver-commit] [2799] Fixed some problems under windows. |
Date: |
Thu, 11 Sep 2008 19:28:47 +0000 |
Revision: 2799
http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2799
Author: gscrivano
Date: 2008-09-11 19:28:46 +0000 (Thu, 11 Sep 2008)
Log Message:
-----------
Fixed some problems under windows. Now all tests are completed successfully.
Modified Paths:
--------------
trunk/myserver/src/base/home_dir/home_dir.cpp
trunk/myserver/src/base/thread/thread.cpp
Modified: trunk/myserver/src/base/home_dir/home_dir.cpp
===================================================================
--- trunk/myserver/src/base/home_dir/home_dir.cpp 2008-09-11 15:25:50 UTC
(rev 2798)
+++ trunk/myserver/src/base/home_dir/home_dir.cpp 2008-09-11 19:28:46 UTC
(rev 2799)
@@ -90,8 +90,8 @@
}
data.clear();
timestamp = 0;
+#endif
loaded = 0;
-#endif
}
/*!
@@ -117,18 +117,18 @@
DWORD len = 64;
char *buf;
buf = new char[len];
- if(!GetProfilesDirectory(buf, &len))
+
+ if(GetProfilesDirectory(buf, &len) == FALSE)
{
- delete buf;
+ delete [] buf;
buf = new char[len];
- if(!GetProfilesDirectory(buf, &len))
+ if(GetProfilesDirectory(buf, &len) == FALSE)
{
- delete buf;
+ delete [] buf;
return 1;
}
}
data.assign(buf);
- return 0;
#else
File usersFile;
u_long size;
@@ -200,12 +200,12 @@
while(buffer[counter++] != '\0');
/* Next tuple. */
}
- loaded = 1;
delete [] buffer;
usersFile.closeFile();
#endif
+
+ loaded = 1;
return 0;
-
}
/*!
Modified: trunk/myserver/src/base/thread/thread.cpp
===================================================================
--- trunk/myserver/src/base/thread/thread.cpp 2008-09-11 15:25:50 UTC (rev
2798)
+++ trunk/myserver/src/base/thread/thread.cpp 2008-09-11 19:28:46 UTC (rev
2799)
@@ -74,7 +74,9 @@
#endif
{
#ifdef WIN32
- return !_beginthreadex(NULL, 0, startRoutine, arg, 0, (unsigned int*)ID);
+ *ID = _beginthreadex(NULL, 0, startRoutine, arg, 0, NULL);
+
+ return !(*ID);
#endif
#ifdef HAVE_PTHREAD
return pthread_create((pthread_t*)ID, NULL, startRoutine, (void *)(arg));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [2799] Fixed some problems under windows.,
Giuseppe Scrivano <=