From 9f66409b88481ca4ded5b9bb9d81e5977a43a5af Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 14 Jul 2011 19:39:32 -0400
Subject: [PATCH] #include correct headers for Windows _open() et al. Also
mollify Linux build, which gets alarmed when you implicitly ignore write()'s
return value. Ignore it explicitly.
---
indra/llcommon/tests/llsdserialize_test.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index ec0cacfe900..025870c9150 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -32,16 +32,18 @@
#include <winsock2.h>
typedef U32 uint32_t;
#include <process.h>
+#include <io.h>
#else
#include <unistd.h>
#include <netinet/in.h>
#include <errno.h>
-#include <fcntl.h>
#include <sys/wait.h>
-#include <sys/stat.h>
#include "llprocesslauncher.h"
#endif
+#include <fcntl.h>
+#include <sys/stat.h>
+
/*==========================================================================*|
// Whoops, seems Linden's Boost package and the viewer are built with
// different settings of VC's /Zc:wchar_t switch! Using Boost.Filesystem
@@ -100,7 +102,7 @@ std::string temp_directory_path()
// Windows names because they're less likely than the Posix names to collide
// with any other names in this source.
#if LL_WINDOWS
-#define _remove DeleteFile
+#define _remove DeleteFileA
#else // ! LL_WINDOWS
#define _open open
#define _write write
@@ -155,8 +157,8 @@ class NamedTempScript
// loop back to try another filename
}
// File is open, its name is in mPath: write it and close it.
- _write(fd, content.c_str(), content.length());
- _write(fd, "\n", 1);
+ (void)_write(fd, content.c_str(), content.length());
+ (void)_write(fd, "\n", 1);
_close(fd);
}
--
GitLab