swc

commit d96dcdee7eed1a902833239cf0238a826f63e939
parent 5120f4fd42cc515844601233844b9f2b7ac17d85
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 25 Nov 2013 02:47:28 -0800

private.h -> internal.h

Diffstat:
M
libswc/drm.c
 | 
2
+-
A
libswc/internal.h
 | 
46
++++++++++++++++++++++++++++++++++++++++++++++
D
libswc/private.h
 | 
46
----------------------------------------------
M
libswc/seat.c
 | 
2
+-
M
libswc/shell.c
 | 
2
+-
M
libswc/swc.c
 | 
2
+-
M
libswc/window.c
 | 
2
+-

7 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/libswc/drm.c b/libswc/drm.c
@@ -24,8 +24,8 @@
 #include "drm.h"
 #include "drm_buffer.h"
 #include "event.h"
+#include "internal.h"
 #include "output.h"
-#include "private.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libswc/internal.h b/libswc/internal.h
@@ -0,0 +1,46 @@
+/* swc: swc/internal.h
+ *
+ * Copyright (c) 2013 Michael Forney
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef SWC_INTERNAL_H
+#define SWC_INTERNAL_H
+
+struct wl_display;
+struct wl_event_loop;
+struct swc_manager;
+struct swc_compositor;
+
+struct swc
+{
+    struct wl_display * display;
+    struct wl_event_loop * event_loop;
+    const struct swc_manager * manager;
+
+    struct udev * udev;
+
+    struct swc_compositor * compositor;
+};
+
+extern struct swc swc;
+
+#endif
+
diff --git a/libswc/private.h b/libswc/private.h
@@ -1,46 +0,0 @@
-/* swc: swc/private.h
- *
- * Copyright (c) 2013 Michael Forney
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef SWC_PRIVATE_H
-#define SWC_PRIVATE_H
-
-struct wl_display;
-struct wl_event_loop;
-struct swc_manager;
-struct swc_compositor;
-
-struct swc
-{
-    struct wl_display * display;
-    struct wl_event_loop * event_loop;
-    const struct swc_manager * manager;
-
-    struct udev * udev;
-
-    struct swc_compositor * compositor;
-};
-
-extern struct swc swc;
-
-#endif
-
diff --git a/libswc/seat.c b/libswc/seat.c
@@ -1,7 +1,7 @@
 #include "seat.h"
 #include "evdev_device.h"
 #include "event.h"
-#include "private.h"
+#include "internal.h"
 #include "util.h"
 
 #include <stdlib.h>
diff --git a/libswc/shell.c b/libswc/shell.c
@@ -22,7 +22,7 @@
  */
 
 #include "shell.h"
-#include "private.h"
+#include "internal.h"
 #include "shell_surface.h"
 
 #include <wayland-server.h>
diff --git a/libswc/swc.c b/libswc/swc.c
@@ -22,9 +22,9 @@
  */
 
 #include "swc.h"
-#include "private.h"
 #include "binding.h"
 #include "compositor.h"
+#include "internal.h"
 #include "shell.h"
 #include "window.h"
 
diff --git a/libswc/window.c b/libswc/window.c
@@ -24,7 +24,7 @@
 #include "window.h"
 #include "compositor.h"
 #include "compositor_surface.h"
-#include "private.h"
+#include "internal.h"
 #include "swc.h"
 
 #include <stdlib.h>