diff --git a/checkin_notes b/checkin_notes index 9d0b6f3853..0aa622c74d 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6020,3 +6020,10 @@ David 20 Sept 2012 - A bunch of tweaks from Steffen Moller, e.g. using MAXPATHLEN various files + +Charlie 21 Sep 2012 + - Mac: Fix build breaks introduced by above changes; path_to_error + arg is modified by CheckNestedDirectories() so can't be const. + + client/ + check_security.cpp diff --git a/client/check_security.cpp b/client/check_security.cpp index 5790e204ed..b52062f496 100644 --- a/client/check_security.cpp +++ b/client/check_security.cpp @@ -42,7 +42,7 @@ bool IsUserInGroupBM(); static int CheckNestedDirectories( char * basepath, int depth, int use_sandbox, int isManager, - cont char * path_to_error + char * path_to_error ); #if (! defined(__WXMAC__) && ! defined(_MAC_INSTALLER)) @@ -501,7 +501,7 @@ saverName[2] = "Progress Thru Processors"; } -static int CheckNestedDirectories(char * basepath, int depth, +static int CheckNestedDirectories(char * basepath, int depth, int use_sandbox, int isManager, char * path_to_error ) {