X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d3820b348955b748fa0ab3076f4ed9763ce4bee..30f82ea416c2b34d1d608cf6ebc369690eb2304e:/include/wx/process.h?ds=sidebyside

diff --git a/include/wx/process.h b/include/wx/process.h
index 96ce4e5fb9..a6dc295a62 100644
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __PROCESSH__
-#define __PROCESSH__
+#ifndef _WX_PROCESSH__
+#define _WX_PROCESSH__
 
 #ifdef __GNUG__
 #pragma interface "process.h"
@@ -25,7 +25,7 @@ class WXDLLEXPORT wxProcess: public wxEvtHandler
   DECLARE_DYNAMIC_CLASS(wxProcess)
  public:
 
-  wxProcess(wxEvtHandler *parent = NULL, int id = -1);
+  wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int id = -1);
   virtual ~wxProcess();
 
   virtual void OnTerminate(int pid);
@@ -55,4 +55,4 @@ typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&);
 #define EVT_END_PROCESS(id, func) { wxEVT_END_TERMINATE, id, -1, (wxObjectEvent) (wxEventFunction) (wxProcessEventFunction) & fn, NULL},
 
 #endif
-    // __PROCESSH__
+    // _WX_PROCESSH__