Commit ea54a97f authored by Ralf Habacker's avatar Ralf Habacker

Merge branch 'dbus-1.8'

Conflicts:
	NEWS
	configure.ac
parents fda9d8a4 01af167b
......@@ -256,4 +256,8 @@
#define inline __inline
#endif
#ifdef DBUS_WIN
#define FD_SETSIZE @FD_SETSIZE@
#endif
#endif // _DBUS_CONFIG_H
include_directories(${CMAKE_SOURCE_DIR}/../test)
add_definitions(${DBUS_INTERNAL_CLIENT_DEFINITIONS})
......@@ -73,7 +74,6 @@ if(DBUS_WITH_GLIB)
include_directories(
${GLIB2_INCLUDE_DIR}
${GOBJECT_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/../test
)
set(TEST_LIBRARIES ${DBUS_INTERNAL_LIBRARIES} dbus-testutils ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES})
......
......@@ -146,7 +146,7 @@ static dbus_pid_t
get_pid_from_extended_tcp_table(int peer_port)
{
dbus_pid_t result;
DWORD errorCode, size, i;
DWORD errorCode, size = 0, i;
MIB_TCPTABLE_OWNER_PID *tcp_table;
if ((errorCode =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment