Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
fee59313
Kaydet (Commit)
fee59313
authored
Ara 13, 2016
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fix weird configury option combination lossage
Change-Id: If67e703d82846c17deecff3e04172bfa339888a6
üst
c5e2eeb1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
1 deletion
+13
-1
AvahiNetworkService.cxx
sd/source/ui/remotecontrol/AvahiNetworkService.cxx
+13
-1
No files found.
sd/source/ui/remotecontrol/AvahiNetworkService.cxx
Dosyayı görüntüle @
fee59313
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4
; fill-column: 100
-*- */
/*
* This file is part of the LibreOffice project.
*
...
...
@@ -6,6 +6,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <config_dbus.h>
#include <time.h>
#include <iostream>
#include <limits>
...
...
@@ -22,7 +25,10 @@
#include <avahi-common/timeval.h>
#include <avahi-common/thread-watch.h>
#include <comphelper/random.hxx>
#if ENABLE_DBUS
#include <dbus/dbus.h>
#endif
#include <sal/log.hxx>
...
...
@@ -161,12 +167,18 @@ static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UN
}
void
AvahiNetworkService
::
setup
()
{
#if ENABLE_DBUS
// Sure, without ENABLE_DBUS it probably makes no sense to try to use this Avahi stuff either,
// but this is just a stop-gap measure to get this to even compile for now with the probably
// pointless combination of configury options --enable-avahi --enable-dbus --disable-gui.
// Avahi internally uses D-Bus, which requires the following in order to be
// thread-safe (and we potentially access D-Bus from different threads in
// different places of the code base):
if
(
!
dbus_threads_init_default
())
{
throw
std
::
bad_alloc
();
}
#endif
int
error
=
0
;
avahiService
=
this
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment