fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-29 19:38:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

apply remaining unapplied parts of eeedba5b2f5b008819619764943caddd52441adf in dbus4win

Browse source
This commit is contained in:
Romain Pokrzywka 2010-02-04 16:36:57 -08:00 • committed by Ralf Habacker
parent 3f05abb3ad
commit deb7e5a9aa
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/ConfigureChecks.cmake
View file

@ -90,7 +90,8 @@ if(MSVC)
SET(DBUS_VA_COPY_FUNC "_DBUS_VA_COPY_ASSIGN";)
else(MSVC)
write_file("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/cmake_try_compile.c" "#include <stdarg.h>
void f (int i, ...) {
#include <stdlib.h>
static void f (int i, ...) {
va_list args1, args2;
va_start (args1, i);
va_copy (args2, args1);
@ -111,7 +112,8 @@ if(DBUS_HAVE_VA_COPY)
SET(DBUS_VA_COPY_FUNC va_copy CACHE STRING "va_copy function")
else(DBUS_HAVE_VA_COPY)
write_file("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/cmake_try_compile.c" "#include <stdarg.h>
void f (int i, ...) {
#include <stdlib.h>
static void f (int i, ...) {
va_list args1, args2;
va_start (args1, i);
__va_copy (args2, args1);

2
dbus/dbus-sysdeps-util-unix.c
View file

@ -1020,7 +1020,7 @@ _dbus_string_get_dirname (const DBusString *filename,
static void
string_squash_nonprintable (DBusString *str)
{
char *buf;
unsigned char *buf;
int i, len;
buf = _dbus_string_get_data (str);

3
dbus/dbus-sysdeps.c
View file

@ -49,6 +49,9 @@ _DBUS_DEFINE_GLOBAL_LOCK (system_users);
#ifdef DBUS_WIN
#include <stdlib.h>
#elif (defined __APPLE__)
# include <crt_externs.h>
# define environ (*_NSGetEnviron())
#else
extern char **environ;
#endif