Author: iratqq
Date: Mon Feb 2 02:45:11 2009
New Revision: 5795
Modified:
trunk/replace/bsd-misc.c
trunk/replace/os_dep.h
trunk/uim/uim-error.c
Log:
* replace/bsd-misc.c:
- Replace include.h to config.h
- Disable functions without strdup.
* uim/uim-error.c (uim_strdup):
- Remove check HAVE_STRDUP.
* replace/os_dep.h:
- Add macro and declaration.
Modified: trunk/replace/bsd-misc.c
==============================================================================
--- trunk/replace/bsd-misc.c (original)
+++ trunk/replace/bsd-misc.c Mon Feb 2 02:45:11 2009
@@ -15,8 +15,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include "includes.h"
+#include <config.h>
+#if 0
#include <sys/types.h>
#ifdef HAVE_SYS_SELECT_H
# include <sys/select.h>
@@ -24,8 +25,10 @@
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
+#endif
#include <string.h>
+#if 0
#include <signal.h>
#include <stdlib.h>
#include <unistd.h>
@@ -225,6 +228,7 @@
return (signal(sig, act));
#endif
}
+#endif /* 0 */
#ifndef HAVE_STRDUP
char *
Modified: trunk/replace/os_dep.h
==============================================================================
--- trunk/replace/os_dep.h (original)
+++ trunk/replace/os_dep.h Mon Feb 2 02:45:11 2009
@@ -87,6 +87,11 @@
size_t strlcat(char *dst, const char *src, size_t siz);
#endif
+#ifndef HAVE_STRDUP
+#define strdup uim_internal_strdup
+char *strdup(const char *);
+#endif
+
#include "fake-rfc2553.h"
#ifndef HAVE_VASPRINTF
Modified: trunk/uim/uim-error.c
==============================================================================
--- trunk/uim/uim-error.c (original)
+++ trunk/uim/uim-error.c Mon Feb 2 02:45:11 2009
@@ -216,17 +216,9 @@
{
char *copied;
-#if HAVE_STRDUP
copied = strdup(s);
if (!copied)
uim_fatal_error("strdup() failed");
-#else
- size_t size;
-
- size = strlen(s) + sizeof("");
- copied = uim_malloc(size);
- strcpy(copied, s);
-#endif
return copied;
}
