diff options
| author | marha <marha@users.sourceforge.net> | 2015-05-26 19:43:34 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-05-26 19:43:34 +0200 |
| commit | 912e881bec8b16f2331225960645c3bdf5a8ba2d (patch) | |
| tree | 92afd568d4b3eaab1faf26d8d95d8c6df0173079 /xorg-server/hw/xwayland/xwayland-output.c | |
| parent | 2e00f3764228cfc91180bbe9375a8d85e0e65a5b (diff) | |
| parent | 843964ee791452b197e41dacb0146f5b456ffaa5 (diff) | |
| download | vcxsrv-912e881bec8b16f2331225960645c3bdf5a8ba2d.tar.gz vcxsrv-912e881bec8b16f2331225960645c3bdf5a8ba2d.tar.bz2 vcxsrv-912e881bec8b16f2331225960645c3bdf5a8ba2d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi_priv.h
mesalib/src/mesa/drivers/dri/swrast/swrast.c
xorg-server/dix/dispatch.c
xorg-server/os/utils.c
xorg-server/record/record.c
Diffstat (limited to 'xorg-server/hw/xwayland/xwayland-output.c')
| -rw-r--r-- | xorg-server/hw/xwayland/xwayland-output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xwayland/xwayland-output.c b/xorg-server/hw/xwayland/xwayland-output.c index 778914c61..155cbc109 100644 --- a/xorg-server/hw/xwayland/xwayland-output.c +++ b/xorg-server/hw/xwayland/xwayland-output.c @@ -159,7 +159,7 @@ xwl_output_create(struct xwl_screen *xwl_screen, uint32_t id) xwl_output = calloc(sizeof *xwl_output, 1); if (xwl_output == NULL) { - ErrorF("create_output ENOMEM"); + ErrorF("create_output ENOMEM\n"); return NULL; } @@ -168,7 +168,7 @@ xwl_output_create(struct xwl_screen *xwl_screen, uint32_t id) wl_output_add_listener(xwl_output->output, &output_listener, xwl_output); if (snprintf(name, sizeof name, "XWAYLAND%d", serial++) < 0) { - ErrorF("create_output ENOMEM"); + ErrorF("create_output ENOMEM\n"); free(xwl_output); return NULL; } |