remove vmhdr.h

With the allocation functions’ prototypes moved to the public header, there was
nothing significant remaining in this header.

diff --git a/lib/vmalloc/CMakeLists.txt b/lib/vmalloc/CMakeLists.txt
index 1c7ac78d150536f5c67c30418be071b7a2a547b5..5032ff4fc874e8c2288f13da81c35b6770ec8790 100644 (file)
--- a/lib/vmalloc/CMakeLists.txt
+++ b/lib/vmalloc/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_library(vmalloc STATIC
     # Header files
     vmalloc.h
-    vmhdr.h
 
     # Source files
     vmalloc.c

diff --git a/lib/vmalloc/Makefile.am b/lib/vmalloc/Makefile.am
index 76338eb3d29c8423b85dd51e8f96862686025684..9f1130c7bd41e63602bbe583a73fa958d7b4bbbb 100644 (file)
--- a/lib/vmalloc/Makefile.am
+++ b/lib/vmalloc/Makefile.am
@@ -2,7 +2,7 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/lib
 
-noinst_HEADERS = vmalloc.h vmhdr.h
+noinst_HEADERS = vmalloc.h
 noinst_LTLIBRARIES = libvmalloc_C.la
 
 libvmalloc_C_la_SOURCES = vmalloc.c vmclear.c vmclose.c \

diff --git a/lib/vmalloc/test.c b/lib/vmalloc/test.c
index df683d9c4bae2604f28d2f8d586aaa64fa133d61..baf5a5568b67051117368bc780cb16844c5aa95a 100644 (file)
--- a/lib/vmalloc/test.c
+++ b/lib/vmalloc/test.c
@@ -11,7 +11,6 @@
 #include <string.h>
 
 // include vmalloc and some of its internals directly so we can call them
-#include <vmalloc/vmhdr.h>
 #include <vmalloc/vmalloc.h>
 #include <vmalloc/vmalloc.c>
 #include <vmalloc/vmclear.c>

diff --git a/lib/vmalloc/vmalloc.c b/lib/vmalloc/vmalloc.c
index b22a9c60050297d74a68913b3bfe338a40315540..3134ab294e7a0e4aaac57c6da6fd11d147dd806a 100644 (file)
--- a/lib/vmalloc/vmalloc.c
+++ b/lib/vmalloc/vmalloc.c
@@ -8,7 +8,6 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#include <vmalloc/vmhdr.h>
 #include <vmalloc/vmalloc.h>
 #include <stdbool.h>
 #include <stdlib.h>

diff --git a/lib/vmalloc/vmalloc.vcxproj b/lib/vmalloc/vmalloc.vcxproj
index a6de3ed50ca87508536922cbb99cbfa98681fabf..5404158fa922bb01541f1858388e5e4af60b94ad 100644 (file)
--- a/lib/vmalloc/vmalloc.vcxproj
+++ b/lib/vmalloc/vmalloc.vcxproj
@@ -93,7 +93,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="vmalloc.h" />
-    <ClInclude Include="vmhdr.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="vmalloc.c" />

diff --git a/lib/vmalloc/vmalloc.vcxproj.filters b/lib/vmalloc/vmalloc.vcxproj.filters
index 09c386f8cdbac285a43f0918d530877def46c1f8..822e8d3c398f8d1458f345941dc5d7c5bfba4c0f 100644 (file)
--- a/lib/vmalloc/vmalloc.vcxproj.filters
+++ b/lib/vmalloc/vmalloc.vcxproj.filters
@@ -18,9 +18,6 @@
     <ClInclude Include="vmalloc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="vmhdr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="vmalloc.c">

diff --git a/lib/vmalloc/vmclear.c b/lib/vmalloc/vmclear.c
index 84a3b10ef51bfa8a257c4dc1879833f420d850ee..7dbbe0b9ba51ca0f963b1d071d45e7abf266db08 100644 (file)
--- a/lib/vmalloc/vmclear.c
+++ b/lib/vmalloc/vmclear.c
@@ -8,7 +8,6 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#include <vmalloc/vmhdr.h>
 #include <vmalloc/vmalloc.h>
 #include <stdlib.h>
 

diff --git a/lib/vmalloc/vmclose.c b/lib/vmalloc/vmclose.c
index 05085b1f09eb5c08fc63c34fb515d73f43bd5d77..baa25cdb5969d849d93a0ea9edbc06fff813b491 100644 (file)
--- a/lib/vmalloc/vmclose.c
+++ b/lib/vmalloc/vmclose.c
@@ -8,7 +8,6 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#include <vmalloc/vmhdr.h>
 #include <vmalloc/vmalloc.h>
 #include <stdlib.h>
 

diff --git a/lib/vmalloc/vmhdr.h b/lib/vmalloc/vmhdr.h
deleted file mode 100644 (file)
index 40b8d3a..0000000
--- a/lib/vmalloc/vmhdr.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Details at https://graphviz.org
- *************************************************************************/
-
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*     Common types, and macros for vmalloc functions.
-**
-**     Written by Kiem-Phong Vo, kpv@research.att.com, 01/16/94.
-*/
-
-#include <stdlib.h>
-#include       <vmalloc/vmalloc.h>
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/lib/vmalloc/vmopen.c b/lib/vmalloc/vmopen.c
index 6f8a5b3445cb701db81ad4504274711b53bf9bbc..0d224d9f87574e47a453a67a0eb0bd309d4147da 100644 (file)
--- a/lib/vmalloc/vmopen.c
+++ b/lib/vmalloc/vmopen.c
@@ -8,7 +8,6 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#include <vmalloc/vmhdr.h>
 #include <vmalloc/vmalloc.h>
 #include <stdlib.h>
 

diff --git a/lib/vmalloc/vmstrdup.c b/lib/vmalloc/vmstrdup.c
index b5fec9cb71dcf6b8617c75f280fe983a8c132113..fdd0f78611d1e13ec06bccfd87c08cc00073ed6f 100644 (file)
--- a/lib/vmalloc/vmstrdup.c
+++ b/lib/vmalloc/vmstrdup.c
@@ -10,7 +10,8 @@
 
 #include <stddef.h>
 #include <string.h>
-#include       <vmalloc/vmhdr.h>
+#include <vmalloc/vmalloc.h>
+
 /*
  * return a copy of s using vmalloc
  */