diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-26 20:19:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-26 20:19:23 +0100 |
| commit | 5f455179ae4b279a82d99a7a3dabe61f58c42ad6 (patch) | |
| tree | fdecec022cf1b8b782b90a64c14e374fa6d400cb /xorg-server/include | |
| parent | 78d84bd03c744b0ed420c450dd2807904ccaef21 (diff) | |
| parent | 30af30b78075159fce477ae99cc72540133714d0 (diff) | |
| download | vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.tar.gz vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.tar.bz2 vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver randrproto libxtrans fontconfig libxcb xcb-proto mesa git update 26 Jan 2014
Conflicts:
X11/xtrans/Xtrans.c
xorg-server/dix/dispatch.c
xorg-server/os/xdmcp.c
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/dix-config.h.in | 3 | ||||
| -rw-r--r-- | xorg-server/include/dixfontstubs.h | 2 | ||||
| -rw-r--r-- | xorg-server/include/dixstruct.h | 1 | ||||
| -rw-r--r-- | xorg-server/include/xorg-server.h.in | 3 |
4 files changed, 6 insertions, 3 deletions
diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in index 957257b12..55cfe4710 100644 --- a/xorg-server/include/dix-config.h.in +++ b/xorg-server/include/dix-config.h.in @@ -472,4 +472,7 @@ /* Don't let Xdefs.h define 'pointer' */ #define _XTYPEDEF_POINTER 1 +/* Ask fontsproto to make font path element names const */ +#define FONT_PATH_ELEMENT_NAME_CONST 1 + #endif /* _DIX_CONFIG_H_ */ diff --git a/xorg-server/include/dixfontstubs.h b/xorg-server/include/dixfontstubs.h index 0454ffa6c..535d312e6 100644 --- a/xorg-server/include/dixfontstubs.h +++ b/xorg-server/include/dixfontstubs.h @@ -11,8 +11,6 @@ extern _X_EXPORT int client_auth_generation(ClientPtr client); extern _X_EXPORT void DeleteFontClientID(Font id); -extern _X_EXPORT FontResolutionPtr GetClientResolutions(int *num); - extern _X_EXPORT int GetDefaultPointSize(void); extern _X_EXPORT Font GetNewFontClientID(void); diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h index 7bbd2bd54..02ba33ec2 100644 --- a/xorg-server/include/dixstruct.h +++ b/xorg-server/include/dixstruct.h @@ -106,7 +106,6 @@ typedef struct _Client { int smart_start_tick; int smart_stop_tick; - int smart_check_tick; DeviceIntPtr clientPtr; ClientIdPtr clientIds; diff --git a/xorg-server/include/xorg-server.h.in b/xorg-server/include/xorg-server.h.in index 0c651bfab..8bf9d38f2 100644 --- a/xorg-server/include/xorg-server.h.in +++ b/xorg-server/include/xorg-server.h.in @@ -224,4 +224,7 @@ /* Use XTrans FD passing support */ #undef XTRANS_SEND_FDS +/* Ask fontsproto to make font path element names const */ +#define FONT_PATH_ELEMENT_NAME_CONST 1 + #endif /* _XORG_SERVER_H_ */ |