Renamed gktclist.[ch] to gtkclist_v12.[ch] to avoid conflicts with the

real gtkclist.h file when building the gtk+ v2 gui.

svn path=/trunk/; revision=8527
This commit is contained in:
Olivier Abad 2003-09-24 06:15:53 +00:00
parent e0ad895b14
commit 0d49ad4d84
3 changed files with 5 additions and 5 deletions

View File

@ -1,7 +1,7 @@
# Makefile.am # Makefile.am
# Automake file for the GTK interface routines for Ethereal # Automake file for the GTK interface routines for Ethereal
# #
# $Id: Makefile.am,v 1.68 2003/09/10 07:17:21 jmayer Exp $ # $Id: Makefile.am,v 1.69 2003/09/24 06:15:51 oabad Exp $
# #
# Ethereal - Network traffic analyzer # Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com> # By Gerald Combs <gerald@ethereal.com>
@ -173,8 +173,8 @@ libui_a_SOURCES = \
follow_dlg.h \ follow_dlg.h \
goto_dlg.c \ goto_dlg.c \
goto_dlg.h \ goto_dlg.h \
gtkclist.c \ gtkclist_v12.c \
gtkclist.h \ gtkclist_v12.h \
gtkglobals.h \ gtkglobals.h \
gtk_stat_util.c \ gtk_stat_util.c \
gtk_stat_util.h \ gtk_stat_util.h \

View File

@ -2,7 +2,7 @@
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald, * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald,
* Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org> * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org>
* *
* $Id: gtkclist.c,v 1.14 2003/06/28 21:46:08 sahlberg Exp $ * $Id: gtkclist_v12.c,v 1.1 2003/09/24 06:15:53 oabad Exp $
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -36,7 +36,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <gtk/gtkmain.h> #include <gtk/gtkmain.h>
#include "gtkclist.h" #include "gtkclist_v12.h"
#include <gtk/gtkbindings.h> #include <gtk/gtkbindings.h>
#include <gtk/gtkdnd.h> #include <gtk/gtkdnd.h>