Author: jim
Date: 2005-07-14 03:06:08 -0600 (Thu, 14 Jul 2005)
New Revision: 1017
Modified:
trunk/
trunk/linux-libc-headers/linux-libc-headers-2.6.12.0-sparc_conflicts-1.patch
Log:
[EMAIL PROTECTED]: jim | 2005-07-14 02:05:53 -0700
Patch was incorrect resubmiited
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1063
+ cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1065
Modified:
trunk/linux-libc-headers/linux-libc-headers-2.6.12.0-sparc_conflicts-1.patch
===================================================================
---
trunk/linux-libc-headers/linux-libc-headers-2.6.12.0-sparc_conflicts-1.patch
2005-07-14 06:01:31 UTC (rev 1016)
+++
trunk/linux-libc-headers/linux-libc-headers-2.6.12.0-sparc_conflicts-1.patch
2005-07-14 09:06:08 UTC (rev 1017)
@@ -5,27 +5,25 @@
Upstream Status: Sent
Description: Remove unistd.h, conflicts with the silo builds
-diff -Naur linux-libc-headers-2.6.12.0/include/asm-sparc/page.h
linux-libc-headers-2.6.12.0.orig/include/asm-sparc/page.h
---- linux-libc-headers-2.6.12.0/include/asm-sparc/page.h 2005-07-09
22:28:38.000000000 -0700
-+++ linux-libc-headers-2.6.12.0.orig/include/asm-sparc/page.h 2005-07-05
17:17:30.000000000 -0700
-@@ -8,6 +8,8 @@
+--- linux-libc-headers-2.6.12.0/include/asm-sparc/page.h.orig 2005-07-14
09:04:05.000000000 +0000
++++ linux-libc-headers-2.6.12.0/include/asm-sparc/page.h 2005-07-14
09:04:12.000000000 +0000
+@@ -8,8 +8,6 @@
#ifndef _SPARC_PAGE_H
#define _SPARC_PAGE_H
-+#include <unistd.h>
-+
+-#include <unistd.h>
+-
#define PAGE_SIZE (getpagesize())
static __inline__ int getpageshift()
{
-diff -Naur linux-libc-headers-2.6.12.0/include/asm-sparc64/page.h
linux-libc-headers-2.6.12.0.orig/include/asm-sparc64/page.h
---- linux-libc-headers-2.6.12.0/include/asm-sparc64/page.h 2005-07-09
22:28:50.000000000 -0700
-+++ linux-libc-headers-2.6.12.0.orig/include/asm-sparc64/page.h
2005-07-05 17:17:43.000000000 -0700
-@@ -1,6 +1,8 @@
+--- linux-libc-headers-2.6.12.0/include/asm-sparc64/page.h.orig
2005-07-14 09:04:23.000000000 +0000
++++ linux-libc-headers-2.6.12.0/include/asm-sparc64/page.h 2005-07-14
09:04:29.000000000 +0000
+@@ -1,8 +1,6 @@
#ifndef _SPARC64_PAGE_H
#define _SPARC64_PAGE_H
-+#include <unistd.h>
-+
+-#include <unistd.h>
+-
#define PAGE_SIZE (getpagesize())
static __inline__ int getpageshift()
{
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
