X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_string.h;h=607130d8c13d1a903cb3a6f9ca6a9c2725dcd7d2;hb=0dc6c1ec345d5c48e348b7e6532e5dcec00fa2ff;hp=ccf21a0cd602bf54454d9a99e6c200d6e7bd2e64;hpb=abffcb058993b19404622ce45cdce3b03045df54;p=palacios.git

diff --git a/palacios/include/palacios/vmm_string.h b/palacios/include/palacios/vmm_string.h
index ccf21a0..607130d 100644
--- a/palacios/include/palacios/vmm_string.h
+++ b/palacios/include/palacios/vmm_string.h
@@ -1,20 +1,41 @@
 /* * String library
  * Copyright (c) 2001,2004 David H. Hovemeyer <daveho@cs.umd.edu>
- * (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
- * (c) 2008, Lei Xia <xiaxlei@gmail.com> 
- * (c) 2008, The V3VEE Project <http://www.v3vee.org> 
- * $Revision: 1.2 $
- * 
- * This is free software.  You are permitted to use,
- * redistribute, and modify it as specified in the file "COPYING".
+ * Copyright (c) 2003, Jeffrey K. Hollingsworth <hollings@cs.umd.edu>
+ *
+ * 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 STRING_H
-#define STRING_H
+/* Modifications:
+ * 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * 2008, Lei Xia <xiaxlei@gmail.com> 
+ */
+
+#ifndef __VMM_STRING_H__
+#define __VMM_STRING_H__
 
 #ifdef __V3VEE__
 
-#include <stddef.h>
+#include <palacios/vmm_stddef.h>
+
 
 void* memset(void* s, int c, size_t n);
 void* memcpy(void *dst, const void* src, size_t n);
@@ -25,6 +46,7 @@ size_t strnlen(const char *s, size_t maxlen);
 int strcmp(const char* s1, const char* s2);
 int strncmp(const char* s1, const char* s2, size_t limit);
 char *strcat(char *s1, const char *s2);
+char *strncat(char *s1, const char *s2, size_t limit);
 char *strcpy(char *dest, const char *src);
 char *strncpy(char *dest, const char *src, size_t limit);
 char *strdup(const char *s1);
@@ -34,9 +56,6 @@ char *strrchr(const char *s, int c);
 char *strpbrk(const char *s, const char *accept);
 
 
-double ceil(double x);
-
-
 #endif // !__V3VEE__
 
 #endif  /* STRING_H */