Skip to content

Commit b94e8b9

Browse files
committed
xrCore: errno_t -> int.
1 parent 6f95867 commit b94e8b9

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/xrCore/FS.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ bool file_handle_internal(LPCSTR file_name, u32& size, int& hFile)
106106
return (true);
107107
}
108108
#else // EDITOR
109-
static errno_t open_internal(LPCSTR fn, int& handle)
109+
static int open_internal(LPCSTR fn, int& handle)
110110
{
111111
return (
112112
_sopen_s(

src/xrCore/_std_extensions.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,12 @@ IC int xr_strcmp(const char* S1, const char* S2)
206206
#ifndef _EDITOR
207207
#ifndef MASTER_GOLD
208208

209-
inline errno_t xr_strcpy(LPSTR destination, size_t const destination_size, LPCSTR source)
209+
inline int xr_strcpy(LPSTR destination, size_t const destination_size, LPCSTR source)
210210
{
211211
return strcpy_s(destination, destination_size, source);
212212
}
213213

214-
inline errno_t xr_strcat(LPSTR destination, size_t const buffer_size, LPCSTR source)
214+
inline int xr_strcat(LPSTR destination, size_t const buffer_size, LPCSTR source)
215215
{
216216
return strcat_s(destination, buffer_size, source);
217217
}
@@ -232,12 +232,12 @@ inline int __cdecl xr_sprintf(char(&destination)[count], LPCSTR format_string, .
232232
}
233233
#else // #ifndef MASTER_GOLD
234234

235-
inline errno_t xr_strcpy(LPSTR destination, size_t const destination_size, LPCSTR source)
235+
inline int xr_strcpy(LPSTR destination, size_t const destination_size, LPCSTR source)
236236
{
237237
return strncpy_s(destination, destination_size, source, destination_size);
238238
}
239239

240-
inline errno_t xr_strcat(LPSTR destination, size_t const buffer_size, LPCSTR source)
240+
inline int xr_strcat(LPSTR destination, size_t const buffer_size, LPCSTR source)
241241
{
242242
size_t const destination_length = xr_strlen(destination);
243243
LPSTR i = destination + destination_length;
@@ -271,13 +271,13 @@ inline int __cdecl xr_sprintf(char(&destination)[count], LPCSTR format_string, .
271271
# pragma deprecated( strcpy, strcpy_s, sprintf, sprintf_s, strcat, strcat_s )
272272

273273
template <int count>
274-
inline errno_t xr_strcpy(char(&destination)[count], LPCSTR source)
274+
inline int xr_strcpy(char(&destination)[count], LPCSTR source)
275275
{
276276
return xr_strcpy(destination, count, source);
277277
}
278278

279279
template <int count>
280-
inline errno_t xr_strcat(char(&destination)[count], LPCSTR source)
280+
inline int xr_strcat(char(&destination)[count], LPCSTR source)
281281
{
282282
return xr_strcat(destination, count, source);
283283
}

src/xrCore/xrDebugNew.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ static void invalid_parameter_handler(
792792
string4096 function_;
793793
string4096 file_;
794794
size_t converted_chars = 0;
795-
// errno_t err =
795+
// int err =
796796
if (expression)
797797
wcstombs_s(
798798
&converted_chars,

0 commit comments

Comments
 (0)