[kdbus] Do not set body message if signature field is empty

[platform/upstream/glib.git] / gio / glocalfileoutputstream.c

diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c
index ec8b9b1..b8fd45c 100644 (file)
--- a/gio/glocalfileoutputstream.c
+++ b/gio/glocalfileoutputstream.c
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  */
@@ -25,9 +23,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <errno.h>
 #include <string.h>
 
@@ -41,6 +36,7 @@
 #include "glocalfileinfo.h"
 
 #ifdef G_OS_UNIX
+#include <unistd.h>
 #include "gfiledescriptorbased.h"
 #endif
 
@@ -165,7 +161,7 @@ g_file_descriptor_based_iface_init (GFileDescriptorBasedIface *iface)
 static void
 g_local_file_output_stream_init (GLocalFileOutputStream *stream)
 {
-  stream->priv = g_local_file_output_stream_get_private (stream);
+  stream->priv = g_local_file_output_stream_get_instance_private (stream);
   stream->priv->do_close = TRUE;
 }
 
@@ -265,7 +261,7 @@ _g_local_file_output_stream_really_close (GLocalFileOutputStream *file,
          if (g_cancellable_set_error_if_cancelled (cancellable, error))
            goto err_out;
          
-#ifdef HAVE_LINK
+#ifdef G_OS_UNIX
          /* create original -> backup link, the original is then renamed over */
          if (g_unlink (file->priv->backup_filename) != 0 &&
              errno != ENOENT)