diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-12 21:11:32 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-12 21:38:35 +0200 |
| commit | 1a83b8e49a75e2dab63805de25e384e0e38c27ed (patch) | |
| tree | 5280fe2a1bd2ce227e4bce9ce06134986e181de1 /xorg-server/include/dix-config.h.in | |
| parent | 4aea4b223604c589828beb1145875a5fbcc41eed (diff) | |
| parent | 9480392b8817f8bfa79cbc694ff039a73fc0a57f (diff) | |
| download | vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.tar.gz vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.tar.bz2 vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/glsl_symbol_table.h
mesalib/src/mesa/drivers/common/meta_blit.c
xorg-server/dix/dispatch.c
xorg-server/glx/indirect_dispatch.c
xorg-server/glx/indirect_dispatch_swap.c
xorg-server/mi/miexpose.c
Diffstat (limited to 'xorg-server/include/dix-config.h.in')
| -rw-r--r-- | xorg-server/include/dix-config.h.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in index f170c1c2f..1aa77a5eb 100644 --- a/xorg-server/include/dix-config.h.in +++ b/xorg-server/include/dix-config.h.in @@ -72,6 +72,10 @@ /* Define to 1 if you have the <dbm.h> header file. */ #undef HAVE_DBM_H +/* Define to 1 if you have the declaration of `program_invocation_short_name', and + to 0 if you don't. */ +#undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME + /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. */ #undef HAVE_DIRENT_H @@ -100,6 +104,9 @@ /* Define to 1 if you have the `getpeerucred' function. */ #undef HAVE_GETPEERUCRED +/* Define to 1 if you have the `getprogname' function. */ +#undef HAVE_GETPROGNAME + /* Define to 1 if you have the `getzoneid' function. */ #undef HAVE_GETZONEID |