mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-05 10:38:08 +01:00
Merge branch 'bugfix/install-gnativesocketaddress' into 'master'
Install header files for GNativeSocketAddress and bump version requirement. Closes #1854 See merge request GNOME/glib!1022
This commit is contained in:
commit
db66bc7944
@ -93,6 +93,7 @@
|
|||||||
#include <gio/gmemoryoutputstream.h>
|
#include <gio/gmemoryoutputstream.h>
|
||||||
#include <gio/gmount.h>
|
#include <gio/gmount.h>
|
||||||
#include <gio/gmountoperation.h>
|
#include <gio/gmountoperation.h>
|
||||||
|
#include <gio/gnativesocketaddress.h>
|
||||||
#include <gio/gnativevolumemonitor.h>
|
#include <gio/gnativevolumemonitor.h>
|
||||||
#include <gio/gnetworkaddress.h>
|
#include <gio/gnetworkaddress.h>
|
||||||
#include <gio/gnetworkmonitor.h>
|
#include <gio/gnetworkmonitor.h>
|
||||||
|
@ -531,8 +531,8 @@ gio_sources = files(
|
|||||||
'gmemoryinputstream.c',
|
'gmemoryinputstream.c',
|
||||||
'gmemoryoutputstream.c',
|
'gmemoryoutputstream.c',
|
||||||
'gmountoperation.c',
|
'gmountoperation.c',
|
||||||
'gnativevolumemonitor.c',
|
|
||||||
'gnativesocketaddress.c',
|
'gnativesocketaddress.c',
|
||||||
|
'gnativevolumemonitor.c',
|
||||||
'gnetworkaddress.c',
|
'gnetworkaddress.c',
|
||||||
'gnetworking.c',
|
'gnetworking.c',
|
||||||
'gnetworkmonitor.c',
|
'gnetworkmonitor.c',
|
||||||
@ -555,6 +555,7 @@ gio_sources = files(
|
|||||||
'gsimpleasyncresult.c',
|
'gsimpleasyncresult.c',
|
||||||
'gsimpleiostream.c',
|
'gsimpleiostream.c',
|
||||||
'gsimplepermission.c',
|
'gsimplepermission.c',
|
||||||
|
'gsimpleproxyresolver.c',
|
||||||
'gsocket.c',
|
'gsocket.c',
|
||||||
'gsocketaddress.c',
|
'gsocketaddress.c',
|
||||||
'gsocketaddressenumerator.c',
|
'gsocketaddressenumerator.c',
|
||||||
@ -565,16 +566,15 @@ gio_sources = files(
|
|||||||
'gsocketinputstream.c',
|
'gsocketinputstream.c',
|
||||||
'gsocketlistener.c',
|
'gsocketlistener.c',
|
||||||
'gsocketoutputstream.c',
|
'gsocketoutputstream.c',
|
||||||
'gsubprocesslauncher.c',
|
|
||||||
'gsubprocess.c',
|
|
||||||
'gsocketservice.c',
|
'gsocketservice.c',
|
||||||
'gsrvtarget.c',
|
'gsrvtarget.c',
|
||||||
'gsimpleproxyresolver.c',
|
'gsubprocesslauncher.c',
|
||||||
|
'gsubprocess.c',
|
||||||
'gtask.c',
|
'gtask.c',
|
||||||
'gtcpconnection.c',
|
'gtcpconnection.c',
|
||||||
'gtcpwrapperconnection.c',
|
'gtcpwrapperconnection.c',
|
||||||
'gthreadedsocketservice.c',
|
|
||||||
'gthemedicon.c',
|
'gthemedicon.c',
|
||||||
|
'gthreadedsocketservice.c',
|
||||||
'gthreadedresolver.c',
|
'gthreadedresolver.c',
|
||||||
'gthreadedresolver.h',
|
'gthreadedresolver.h',
|
||||||
'gtlsbackend.c',
|
'gtlsbackend.c',
|
||||||
@ -657,21 +657,22 @@ gio_headers = files(
|
|||||||
'ginetaddress.h',
|
'ginetaddress.h',
|
||||||
'ginetaddressmask.h',
|
'ginetaddressmask.h',
|
||||||
'ginetsocketaddress.h',
|
'ginetsocketaddress.h',
|
||||||
'ginputstream.h',
|
|
||||||
'ginitable.h',
|
'ginitable.h',
|
||||||
|
'ginputstream.h',
|
||||||
'gio.h',
|
'gio.h',
|
||||||
'gio-autocleanups.h',
|
'gio-autocleanups.h',
|
||||||
'giotypes.h',
|
|
||||||
'gioenums.h',
|
'gioenums.h',
|
||||||
'gioerror.h',
|
'gioerror.h',
|
||||||
'giomodule.h',
|
'giomodule.h',
|
||||||
'gioscheduler.h',
|
'gioscheduler.h',
|
||||||
'giostream.h',
|
'giostream.h',
|
||||||
|
'giotypes.h',
|
||||||
'gloadableicon.h',
|
'gloadableicon.h',
|
||||||
'gmount.h',
|
'gmount.h',
|
||||||
'gmemoryinputstream.h',
|
'gmemoryinputstream.h',
|
||||||
'gmemoryoutputstream.h',
|
'gmemoryoutputstream.h',
|
||||||
'gmountoperation.h',
|
'gmountoperation.h',
|
||||||
|
'gnativesocketaddress.h',
|
||||||
'gnativevolumemonitor.h',
|
'gnativevolumemonitor.h',
|
||||||
'gnetworkaddress.h',
|
'gnetworkaddress.h',
|
||||||
'gnetworkmonitor.h',
|
'gnetworkmonitor.h',
|
||||||
@ -681,8 +682,8 @@ gio_headers = files(
|
|||||||
'gpollableinputstream.h',
|
'gpollableinputstream.h',
|
||||||
'gpollableoutputstream.h',
|
'gpollableoutputstream.h',
|
||||||
'gpollableutils.h',
|
'gpollableutils.h',
|
||||||
'gproxyaddress.h',
|
|
||||||
'gproxy.h',
|
'gproxy.h',
|
||||||
|
'gproxyaddress.h',
|
||||||
'gproxyaddressenumerator.h',
|
'gproxyaddressenumerator.h',
|
||||||
'gproxyresolver.h',
|
'gproxyresolver.h',
|
||||||
'gresolver.h',
|
'gresolver.h',
|
||||||
@ -691,6 +692,7 @@ gio_headers = files(
|
|||||||
'gsimpleasyncresult.h',
|
'gsimpleasyncresult.h',
|
||||||
'gsimpleiostream.h',
|
'gsimpleiostream.h',
|
||||||
'gsimplepermission.h',
|
'gsimplepermission.h',
|
||||||
|
'gsimpleproxyresolver.h',
|
||||||
'gsocket.h',
|
'gsocket.h',
|
||||||
'gsocketaddress.h',
|
'gsocketaddress.h',
|
||||||
'gsocketaddressenumerator.h',
|
'gsocketaddressenumerator.h',
|
||||||
@ -701,14 +703,13 @@ gio_headers = files(
|
|||||||
'gsocketlistener.h',
|
'gsocketlistener.h',
|
||||||
'gsocketservice.h',
|
'gsocketservice.h',
|
||||||
'gsrvtarget.h',
|
'gsrvtarget.h',
|
||||||
'gsimpleproxyresolver.h',
|
|
||||||
'gtask.h',
|
|
||||||
'gsubprocess.h',
|
'gsubprocess.h',
|
||||||
'gsubprocesslauncher.h',
|
'gsubprocesslauncher.h',
|
||||||
|
'gtask.h',
|
||||||
'gtcpconnection.h',
|
'gtcpconnection.h',
|
||||||
'gtcpwrapperconnection.h',
|
'gtcpwrapperconnection.h',
|
||||||
'gthreadedsocketservice.h',
|
|
||||||
'gthemedicon.h',
|
'gthemedicon.h',
|
||||||
|
'gthreadedsocketservice.h',
|
||||||
'gtlsbackend.h',
|
'gtlsbackend.h',
|
||||||
'gtlscertificate.h',
|
'gtlscertificate.h',
|
||||||
'gtlsclientconnection.h',
|
'gtlsclientconnection.h',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user