diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-08 22:13:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-08 22:13:37 +0200 |
| commit | 880395e8c3f451bf34b96da76fcee133b356e966 (patch) | |
| tree | f06a3d96e15a7a200c0af73eb6ff3c7d0e5c87a4 | |
| parent | b5a2c971202ff19079cb5a98253d8760ae124d15 (diff) | |
| download | vcxsrv-880395e8c3f451bf34b96da76fcee133b356e966.tar.gz vcxsrv-880395e8c3f451bf34b96da76fcee133b356e966.tar.bz2 vcxsrv-880395e8c3f451bf34b96da76fcee133b356e966.zip | |
Solved compile problems due to latest merge
| -rw-r--r-- | apps/xwininfo/clientwin.c | 2 | ||||
| -rw-r--r-- | apps/xwininfo/config.h | 4 | ||||
| -rwxr-xr-x | apps/xwininfo/xwininfo.c | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/apps/xwininfo/clientwin.c b/apps/xwininfo/clientwin.c index 2b1de04e8..c568e1011 100644 --- a/apps/xwininfo/clientwin.c +++ b/apps/xwininfo/clientwin.c @@ -19,6 +19,8 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ +#include "config.h" + #include <xcb/xcb.h> #include <xcb/xproto.h> diff --git a/apps/xwininfo/config.h b/apps/xwininfo/config.h index b77456819..d842dcc60 100644 --- a/apps/xwininfo/config.h +++ b/apps/xwininfo/config.h @@ -46,7 +46,7 @@ #undef PACKAGE_NAME /* Define to the full name and version of this package. */ -#undef PACKAGE_STRING +#define PACKAGE_STRING "xwininfo" /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME @@ -107,3 +107,5 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE + +#define _X_COLD diff --git a/apps/xwininfo/xwininfo.c b/apps/xwininfo/xwininfo.c index cda2e2f9d..e3caae4e2 100755 --- a/apps/xwininfo/xwininfo.c +++ b/apps/xwininfo/xwininfo.c @@ -547,6 +547,7 @@ main (int argc, char **argv) if (!strcmp(argv[i], "-pause")) { pauseatend = 1; continue; + } if (!strcmp(argv[i], "-version")) { puts(PACKAGE_STRING); exit(0); |