diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2003-09-09 09:07:14 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2003-09-09 09:07:14 +0000 |
| commit | 411cb773030e02c82755f71fb683299eed4fda25 (patch) | |
| tree | 9fb16c2a2261ac463ac3af6f038dfea2ae82e8d1 | |
| parent | 5e6d9962597a15468bfa72ae72b2fe7ccaf145b8 (diff) | |
Nettoyages warnings gcc (PR#1813)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5825 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | win32caml/menu.c | 1 | ||||
| -rw-r--r-- | win32caml/ocaml.c | 1 | ||||
| -rw-r--r-- | win32caml/startocaml.c | 7 |
3 files changed, 6 insertions, 3 deletions
diff --git a/win32caml/menu.c b/win32caml/menu.c index ad5cc2f6a..34815d89f 100644 --- a/win32caml/menu.c +++ b/win32caml/menu.c @@ -18,6 +18,7 @@ #include "inria.h" #include "inriares.h" +void InterruptOcaml(void); LOGFONT CurrentFont; int CurrentFontFamily = (FIXED_PITCH | FF_MODERN); int CurrentFontStyle; diff --git a/win32caml/ocaml.c b/win32caml/ocaml.c index 65f2e02e9..1172b2bd8 100644 --- a/win32caml/ocaml.c +++ b/win32caml/ocaml.c @@ -29,6 +29,7 @@ int EditControls = IDEDITCONTROL; static WNDPROC lpEProc; static char lineBuffer[1024*32]; +int ResetText(void); int ReadToLineBuffer(void); int AddLineBuffer(void); static int busy; diff --git a/win32caml/startocaml.c b/win32caml/startocaml.c index c22256355..37ebde1c2 100644 --- a/win32caml/startocaml.c +++ b/win32caml/startocaml.c @@ -14,7 +14,6 @@ #include <windows.h> #include <stdio.h> -#include <windows.h> #include <direct.h> #include <io.h> #include "inria.h" @@ -144,6 +143,7 @@ int GetOcamlPath(void) "Software", "Objective Caml", "InterpreterPath", path)) { /* Key doesn't exist? Ask user */ + path[0] = '\0'; if (!BrowseForFile("Ocaml interpreter|ocaml.exe", path)) { ShowDbgMsg("Impossible to find ocaml.exe. I quit"); exit(0); @@ -217,13 +217,14 @@ int IsWindowsNT(void) Errors: If any system call for whatever reason fails, the thread will exit. No error message is shown. ------------------------------------------------------------------------*/ -int _stdcall DoStartOcaml(HWND hwndParent) +DWORD _stdcall DoStartOcaml(LPVOID param) { char *cmdline; int processStarted; LPSECURITY_ATTRIBUTES lpsa=NULL; SECURITY_ATTRIBUTES sa; SECURITY_DESCRIPTOR sd; + HWND hwndParent = (HWND) param; sa.nLength = sizeof(SECURITY_ATTRIBUTES); // Under windows NT/2000/Whistler we have to initialize the security descriptors @@ -356,7 +357,7 @@ void InterruptOcaml(void) { if (! GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, pi.dwProcessId)) { char message[1024]; - sprintf(message, "GenerateConsole failed: %d\n", GetLastError()); + sprintf(message, "GenerateConsole failed: %ld\n", GetLastError()); MessageBox(NULL, message, "Ocaml", MB_OK); } WriteToPipe(" "); |