125 lines
5.4 KiB
Diff
125 lines
5.4 KiB
Diff
diff -Naur acpica-unix2-20150818/source/tools/acpinames/acpinames.h acpica-unix2-20150818.fixes/source/tools/acpinames/acpinames.h
|
|
--- acpica-unix2-20150818/source/tools/acpinames/acpinames.h 1969-12-31 17:00:00.000000000 -0700
|
|
+++ acpica-unix2-20150818.fixes/source/tools/acpinames/acpinames.h 2015-09-09 17:40:12.850371450 -0600
|
|
@@ -0,0 +1,58 @@
|
|
+/******************************************************************************
|
|
+ *
|
|
+ * Module Name: acpinames.h - Common include for AcpiNames utility
|
|
+ *
|
|
+ *****************************************************************************/
|
|
+
|
|
+/*
|
|
+ * Copyright (C) 2000 - 2015, Intel Corp.
|
|
+ * All rights reserved.
|
|
+ *
|
|
+ * Redistribution and use in source and binary forms, with or without
|
|
+ * modification, are permitted provided that the following conditions
|
|
+ * are met:
|
|
+ * 1. Redistributions of source code must retain the above copyright
|
|
+ * notice, this list of conditions, and the following disclaimer,
|
|
+ * without modification.
|
|
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
|
|
+ * substantially similar to the "NO WARRANTY" disclaimer below
|
|
+ * ("Disclaimer") and any redistribution must be conditioned upon
|
|
+ * including a substantially similar Disclaimer requirement for further
|
|
+ * binary redistribution.
|
|
+ * 3. Neither the names of the above-listed copyright holders nor the names
|
|
+ * of any contributors may be used to endorse or promote products derived
|
|
+ * from this software without specific prior written permission.
|
|
+ *
|
|
+ * Alternatively, this software may be distributed under the terms of the
|
|
+ * GNU General Public License ("GPL") version 2 as published by the Free
|
|
+ * Software Foundation.
|
|
+ *
|
|
+ * NO WARRANTY
|
|
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
|
|
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
|
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
+ * POSSIBILITY OF SUCH DAMAGES.
|
|
+ */
|
|
+
|
|
+#ifndef _ACPINAMES_H
|
|
+#define _ACPINAMES_H
|
|
+
|
|
+#include "acpi.h"
|
|
+#include "accommon.h"
|
|
+#include "acapps.h"
|
|
+#include "acutils.h"
|
|
+#include "../acpiexec/aecommon.h"
|
|
+
|
|
+#include <stdio.h>
|
|
+
|
|
+#define ACPI_MAX_INIT_TABLES (32)
|
|
+
|
|
+extern BOOLEAN AcpiGbl_NsLoadOnly;
|
|
+#endif
|
|
diff -Naur acpica-unix2-20150818/source/tools/acpinames/AcpiNames.h acpica-unix2-20150818.fixes/source/tools/acpinames/AcpiNames.h
|
|
--- acpica-unix2-20150818/source/tools/acpinames/AcpiNames.h 2015-08-18 14:11:26.000000000 -0600
|
|
+++ acpica-unix2-20150818.fixes/source/tools/acpinames/AcpiNames.h 1969-12-31 17:00:00.000000000 -0700
|
|
@@ -1,58 +0,0 @@
|
|
-/******************************************************************************
|
|
- *
|
|
- * Module Name: acpinames.h - Common include for AcpiNames utility
|
|
- *
|
|
- *****************************************************************************/
|
|
-
|
|
-/*
|
|
- * Copyright (C) 2000 - 2015, Intel Corp.
|
|
- * All rights reserved.
|
|
- *
|
|
- * Redistribution and use in source and binary forms, with or without
|
|
- * modification, are permitted provided that the following conditions
|
|
- * are met:
|
|
- * 1. Redistributions of source code must retain the above copyright
|
|
- * notice, this list of conditions, and the following disclaimer,
|
|
- * without modification.
|
|
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
|
|
- * substantially similar to the "NO WARRANTY" disclaimer below
|
|
- * ("Disclaimer") and any redistribution must be conditioned upon
|
|
- * including a substantially similar Disclaimer requirement for further
|
|
- * binary redistribution.
|
|
- * 3. Neither the names of the above-listed copyright holders nor the names
|
|
- * of any contributors may be used to endorse or promote products derived
|
|
- * from this software without specific prior written permission.
|
|
- *
|
|
- * Alternatively, this software may be distributed under the terms of the
|
|
- * GNU General Public License ("GPL") version 2 as published by the Free
|
|
- * Software Foundation.
|
|
- *
|
|
- * NO WARRANTY
|
|
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
|
|
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
|
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
- * POSSIBILITY OF SUCH DAMAGES.
|
|
- */
|
|
-
|
|
-#ifndef _ACPINAMES_H
|
|
-#define _ACPINAMES_H
|
|
-
|
|
-#include "acpi.h"
|
|
-#include "accommon.h"
|
|
-#include "acapps.h"
|
|
-#include "acutils.h"
|
|
-#include "../acpiexec/aecommon.h"
|
|
-
|
|
-#include <stdio.h>
|
|
-
|
|
-#define ACPI_MAX_INIT_TABLES (32)
|
|
-
|
|
-extern BOOLEAN AcpiGbl_NsLoadOnly;
|
|
-#endif
|