[gtk+] Rename GdkQuartzWindow.h and .c to GdkQuartzNSWindow.h and .c
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Rename GdkQuartzWindow.h and .c to GdkQuartzNSWindow.h and .c
- Date: Fri, 24 Dec 2010 19:29:39 +0000 (UTC)
commit 806b6dfa08db0cdaa7d0489e085337b143896ea4
Author: John Ralls <jralls ceridwen us>
Date: Fri Dec 24 11:25:40 2010 -0800
Rename GdkQuartzWindow.h and .c to GdkQuartzNSWindow.h and .c
Normally HFS+ (the MacOSX file system) isn't case-sensitive, so having both
GtkQuartzWindow.h and gtkquartzwindow.h causes the latter to overwrite the
former during git pull, breaking the build.
.../{GdkQuartzWindow.c => GdkQuartzNSWindow.c} | 2 +-
.../{GdkQuartzWindow.h => GdkQuartzNSWindow.h} | 2 +-
gdk/quartz/Makefile.am | 4 ++--
gdk/quartz/gdkwindow-quartz.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gdk/quartz/GdkQuartzWindow.c b/gdk/quartz/GdkQuartzNSWindow.c
similarity index 99%
rename from gdk/quartz/GdkQuartzWindow.c
rename to gdk/quartz/GdkQuartzNSWindow.c
index 67db8bb..ee21797 100644
--- a/gdk/quartz/GdkQuartzWindow.c
+++ b/gdk/quartz/GdkQuartzNSWindow.c
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#import "GdkQuartzWindow.h"
+#import "GdkQuartzNSWindow.h"
#include "gdkquartzwindow.h"
#include "gdkdnd-quartz.h"
#include "gdkprivate-quartz.h"
diff --git a/gdk/quartz/GdkQuartzWindow.h b/gdk/quartz/GdkQuartzNSWindow.h
similarity index 98%
rename from gdk/quartz/GdkQuartzWindow.h
rename to gdk/quartz/GdkQuartzNSWindow.h
index 0c7e6a2..676c48a 100644
--- a/gdk/quartz/GdkQuartzWindow.h
+++ b/gdk/quartz/GdkQuartzNSWindow.h
@@ -1,4 +1,4 @@
-/* GdkQuartzWindow.h
+/* GdkQuartzNSWindow.h
*
* Copyright (C) 2005-2007 Imendio AB
*
diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index 33197e9..9b21353 100644
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -20,8 +20,8 @@ noinst_LTLIBRARIES = libgdk-quartz.la
libgdk_quartz_la_SOURCES = \
GdkQuartzView.c \
GdkQuartzView.h \
- GdkQuartzWindow.c \
- GdkQuartzWindow.h \
+ GdkQuartzNSWindow.c \
+ GdkQuartzNSWindow.h \
gdkcursor-quartz.c \
gdkdevice-core-quartz.c \
gdkdevicemanager-core-quartz.c \
diff --git a/gdk/quartz/gdkwindow-quartz.h b/gdk/quartz/gdkwindow-quartz.h
index f55bbb3..f89c20c 100644
--- a/gdk/quartz/gdkwindow-quartz.h
+++ b/gdk/quartz/gdkwindow-quartz.h
@@ -22,7 +22,7 @@
#define __GDK_WINDOW_QUARTZ_H__
#import <gdk/quartz/GdkQuartzView.h>
-#import <gdk/quartz/GdkQuartzWindow.h>
+#import <gdk/quartz/GdkQuartzNSWindow.h>
#include "gdk/gdkwindowimpl.h"
G_BEGIN_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]