Commit 75c4ce82 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'alon/libcacard_ccid.4' into staging 



# By Stefan Weil
# Via Alon Levy
* alon/libcacard_ccid.4:
  libcacard: Fix compilation for older versions of glib (bug #1258168)

Message-id: 1386596263-26151-1-git-send-email-alevy@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents 45506cc2 5ad04fb6

libcacard/vscclient.c

+2 −2
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ do_socket_read(GIOChannel *source, 
            }

            break;

        default:

            g_warn_if_reached();

            g_assert_not_reached();

            return FALSE;

        }
@@ -760,7 +760,7 @@ main( 


    g_io_channel_unref(channel_stdin);

    g_io_channel_unref(channel_socket);

    g_byte_array_unref(socket_to_send);

    g_byte_array_free(socket_to_send, TRUE);



    closesocket(sock);

    return 0;