1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

os0sync.c, os0file.c:

Browse Source 
Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows
This commit is contained in:
heikki@hundin.mysql.fi 2005-06-10 14:18:36 +03:00
parent 4441b59711
commit 6c38471e87
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
innobase/os/os0file.c
View File

@ -605,7 +605,7 @@ os_file_opendir(
lpFindFileData = ut_malloc(sizeof(WIN32_FIND_DATA)); lpFindFileData = ut_malloc(sizeof(WIN32_FIND_DATA));
dir = FindFirstFile(path, lpFindFileData); dir = FindFirstFile((LPCTSTR) path, lpFindFileData);
ut_free(lpFindFileData); ut_free(lpFindFileData);
@ -686,15 +686,15 @@ next_file:
ret = FindNextFile(dir, lpFindFileData); ret = FindNextFile(dir, lpFindFileData);
if (ret) { if (ret) {
ut_a(strlen(lpFindFileData->cFileName) < OS_FILE_MAX_PATH); ut_a(strlen((char *) lpFindFileData->cFileName) < OS_FILE_MAX_PATH);
if (strcmp(lpFindFileData->cFileName, ".") == 0 if (strcmp((char *) lpFindFileData->cFileName, ".") == 0
|| strcmp(lpFindFileData->cFileName, "..") == 0) { || strcmp((char *) lpFindFileData->cFileName, "..") == 0) {
goto next_file; goto next_file;
} }
strcpy(info->name, lpFindFileData->cFileName); strcpy(info->name, (char *) lpFindFileData->cFileName);
info->size = (ib_longlong)(lpFindFileData->nFileSizeLow) info->size = (ib_longlong)(lpFindFileData->nFileSizeLow)
+ (((ib_longlong)(lpFindFileData->nFileSizeHigh)) << 32); + (((ib_longlong)(lpFindFileData->nFileSizeHigh)) << 32);
@ -830,7 +830,7 @@ os_file_create_directory(
#ifdef __WIN__ #ifdef __WIN__
BOOL rcode; BOOL rcode;
rcode = CreateDirectory(pathname, NULL); rcode = CreateDirectory((LPCTSTR) pathname, NULL);
if (!(rcode != 0 || if (!(rcode != 0 ||
(GetLastError() == ERROR_ALREADY_EXISTS && !fail_if_exists))) { (GetLastError() == ERROR_ALREADY_EXISTS && !fail_if_exists))) {
/* failure */ /* failure */
@ -914,7 +914,7 @@ try_again:
ut_error; ut_error;
} }
file = CreateFile(name, file = CreateFile((LPCTSTR) name,
access, access,
FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
/* file can be read ansd written also /* file can be read ansd written also
@ -1053,7 +1053,7 @@ os_file_create_simple_no_error_handling(
ut_error; ut_error;
} }
file = CreateFile(name, file = CreateFile((LPCTSTR) name,
access, access,
share_mode, share_mode,
NULL, /* default security attributes */ NULL, /* default security attributes */
@ -1200,7 +1200,7 @@ try_again:
ut_error; ut_error;
} }
file = CreateFile(name, file = CreateFile((LPCTSTR) name,
GENERIC_READ | GENERIC_WRITE, /* read and write GENERIC_READ | GENERIC_WRITE, /* read and write
access */ access */
share_mode, /* File can be read also by other share_mode, /* File can be read also by other

6
innobase/os/os0sync.c
View File

@ -121,7 +121,7 @@ os_event_create(
event->handle = CreateEvent(NULL,/* No security attributes */ event->handle = CreateEvent(NULL,/* No security attributes */
TRUE, /* Manual reset */ TRUE, /* Manual reset */
FALSE, /* Initial state nonsignaled */ FALSE, /* Initial state nonsignaled */
name); (LPCTSTR) name);
if (!event->handle) { if (!event->handle) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Could not create a Windows event semaphore; Windows error %lu\n", "InnoDB: Could not create a Windows event semaphore; Windows error %lu\n",
@ -177,7 +177,7 @@ os_event_create_auto(
event->handle = CreateEvent(NULL,/* No security attributes */ event->handle = CreateEvent(NULL,/* No security attributes */
FALSE, /* Auto-reset */ FALSE, /* Auto-reset */
FALSE, /* Initial state nonsignaled */ FALSE, /* Initial state nonsignaled */
name); (LPCTSTR) name);
if (!event->handle) { if (!event->handle) {
fprintf(stderr, fprintf(stderr,
@ -440,7 +440,7 @@ os_mutex_create(
mutex = CreateMutex(NULL, /* No security attributes */ mutex = CreateMutex(NULL, /* No security attributes */
FALSE, /* Initial state: no owner */ FALSE, /* Initial state: no owner */
name); (LPCTSTR) name);
ut_a(mutex); ut_a(mutex);
#else #else
os_fast_mutex_t* mutex; os_fast_mutex_t* mutex;