From: Matt Fleming <matt.fleming@linux.intel.com>
Date: Wed, 13 Apr 2011 23:50:08 +0000 (+0100)
Subject: com32: We only need one refstr.h
X-Git-Tag: syslinux-5.00-pre1~61
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c192a160451afed805546973f8ab46050d09723;p=platform%2Fupstream%2Fsyslinux.git

com32: We only need one refstr.h

Delete the duplicate refstr.h and move the remaining copy into
com32/include so that it can be included by both ldlinux and the menu
code.

Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
---

diff --git a/com32/elflink/ldlinux/refstr.h b/com32/elflink/ldlinux/refstr.h
deleted file mode 100644
index 7001d40..0000000
--- a/com32/elflink/ldlinux/refstr.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ----------------------------------------------------------------------- *
- *
- *   Copyright 2008 H. Peter Anvin - All Rights Reserved
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- *   Boston MA 02110-1301, USA; either version 2 of the License, or
- *   (at your option) any later version; incorporated herein by reference.
- *
- * ----------------------------------------------------------------------- */
-
-/*
- * refstr.h
- *
- * Simple reference-counted strings
- */
-
-#ifndef REFSTR_H
-#define REFSTR_H
-
-#include <stddef.h>
-#include <stdarg.h>
-
-static inline __attribute__ ((always_inline))
-const char *refstr_get(const char *r)
-{
-    if (r)
-	((unsigned int *)r)[-1]++;
-    return r;
-}
-
-void refstr_put(const char *);
-char *refstr_alloc(size_t);
-const char *refstrdup(const char *);
-const char *refstrndup(const char *, size_t);
-int rsprintf(const char **, const char *, ...);
-int vrsprintf(const char **, const char *, va_list);
-
-#endif
diff --git a/com32/menu/refstr.h b/com32/include/refstr.h
similarity index 100%
rename from com32/menu/refstr.h
rename to com32/include/refstr.h