# # # patch "win32/fs.cc" # from [8bc32fb3d17cb65315ac3107b20ec312092a23ad] # to [2f8c649c7a5371fb95d2200dbfd02bf91d337b18] # # patch "win32/get_system_flavour.cc" # from [3ef9fa6a5e3cde262aee295e2a52d2e114715ae7] # to [cc5beacf212b783531bb3591872d9dc9fa6c657a] # # patch "win32/process.cc" # from [4ad144502cc101e4b35702c0a8891c50cf2286cc] # to [343c1c8111ae101e9326d61df86cf27a82c82d04] # ============================================================ --- win32/fs.cc 8bc32fb3d17cb65315ac3107b20ec312092a23ad +++ win32/fs.cc 2f8c649c7a5371fb95d2200dbfd02bf91d337b18 @@ -42,7 +42,7 @@ get_default_confdir_base() static std::string get_default_confdir_base() { - char * appdata = getenv("APPDATA"); + char const * appdata = getenv("APPDATA"); if (appdata != NULL) return appdata; TCHAR szPath[MAX_PATH]; @@ -71,7 +71,7 @@ get_homedir() // file for the discussion). For consistency, we now calculate the user's // home path using the same technique that Qt's QDir::homePath() uses on // Windows. - char * home = getenv("HOME"); + char const * home = getenv("HOME"); if (home != NULL) { L(FL("Home directory from HOME\n")); @@ -80,21 +80,21 @@ get_homedir() // Otherwise, try USERPROFILE. We could also use SHGetFolderPath() to get // at USERPROFILE without requiring it to be set as an environment // variable, but Qt doesn't, so we won't either. - char * userprofile = getenv("USERPROFILE"); + char const * userprofile = getenv("USERPROFILE"); if (userprofile != NULL) { L(FL("Home directory from USERPROFILE\n")); return userprofile; } // Try concatenating HOMEDRIVE and HOMEPATH - char * homedrive = getenv("HOMEDRIVE"); - char * homepath = getenv("HOMEPATH"); + char const * homedrive = getenv("HOMEDRIVE"); + char const * homepath = getenv("HOMEPATH"); if (homedrive != NULL && homepath != NULL) { L(FL("Home directory from HOMEDRIVE+HOMEPATH\n")); return std::string(homedrive) + homepath; } - char * systemdrive = getenv("SystemDrive"); + char const * systemdrive = getenv("SystemDrive"); if (systemdrive != NULL) { L(FL("Home directory from SystemDrive\n")); ============================================================ --- win32/get_system_flavour.cc 3ef9fa6a5e3cde262aee295e2a52d2e114715ae7 +++ win32/get_system_flavour.cc cc5beacf212b783531bb3591872d9dc9fa6c657a @@ -12,7 +12,7 @@ struct table_entry struct table_entry { unsigned long key; - char * val; + char const * val; }; void ============================================================ --- win32/process.cc 4ad144502cc101e4b35702c0a8891c50cf2286cc +++ win32/process.cc 343c1c8111ae101e9326d61df86cf27a82c82d04 @@ -89,7 +89,7 @@ std::string } std::string -munge_argv_into_cmdline(const char * const argv[]) +munge_argv_into_cmdline(char const * const argv[]) { std::string cmdline; @@ -103,7 +103,7 @@ int } int -existsonpath(const char * exe) +existsonpath(char const * exe) { if (SearchPath(NULL, exe, ".exe", 0, NULL, NULL)==0) return -1; @@ -111,25 +111,25 @@ bool } bool -is_executable(const char * path) +is_executable(char const * path) { return false; /* Basically meaningless on win32 */ } int -make_executable(const char * path) +make_executable(char const * path) { return 0; /* Basically meaningless on win32 */ } pid_t -process_spawn(const char * const argv[]) +process_spawn(char const * const argv[]) { std::vector realexe; realexe.resize(strlen(argv[0]) + 1 + MAXPATH); L(FL("searching for exe: %s\n") % realexe); - char * filepart; + char const * filepart; if (SearchPath(NULL, argv[0], ".exe", realexe.size(), &*realexe.begin(), &filepart) == 0) {