Skip to content

Commit

Permalink
vl: rename DisplayType to LegacyDisplayType
Browse files Browse the repository at this point in the history
qapi DisplayType will replace the current enum.  For the transition both
will coexist though, so rename it so we don't have a name clash.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20180202111022.19269-4-kraxel@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  • Loading branch information
kraxel committed Feb 20, 2018
1 parent 6735844 commit be045e6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions vl.c
Expand Up @@ -2083,20 +2083,20 @@ static void select_vgahw(const char *p)
}
}

typedef enum DisplayType {
typedef enum LegacyDisplayType {
DT_DEFAULT,
DT_CURSES,
DT_SDL,
DT_COCOA,
DT_GTK,
DT_EGL,
DT_NONE,
} DisplayType;
} LegacyDisplayType;

static DisplayType select_display(const char *p)
static LegacyDisplayType select_display(const char *p)
{
const char *opts;
DisplayType display = DT_DEFAULT;
LegacyDisplayType display = DT_DEFAULT;

if (strstart(p, "sdl", &opts)) {
#ifdef CONFIG_SDL
Expand Down Expand Up @@ -3051,7 +3051,7 @@ int main(int argc, char **argv, char **envp)
const char *incoming = NULL;
bool userconfig = true;
bool nographic = false;
DisplayType display_type = DT_DEFAULT;
LegacyDisplayType display_type = DT_DEFAULT;
int display_remote = 0;
const char *log_mask = NULL;
const char *log_file = NULL;
Expand Down

0 comments on commit be045e6

Please sign in to comment.