Author: mturk
Date: Tue Apr 7 15:28:16 2009
New Revision: 762819
URL: http://svn.apache.org/viewvc?rev=762819&view=rev
Log:
Some copy/paste typos fixed
Modified:
commons/sandbox/runtime/trunk/src/main/native/Makefile.in
commons/sandbox/runtime/trunk/src/main/native/configure
commons/sandbox/runtime/trunk/src/main/native/include/acr.h
commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c
Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.in
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.in?rev=762819&r1=762818&r2=762819&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.in Tue Apr 7
15:28:16 2009
@@ -49,7 +49,7 @@
SONAME=lib$(NAME)$(SO)
SHAREDLIB=lib$(NAME)$(SO)
-SRCDIR=$(TOPDIR)/src
+SRCDIR=$(TOPDIR)
INCDIR=$(TOPDIR)/include
BLDDIR=$(TOPDIR)/.libs
PWDDIR=$(PWD)
@@ -65,27 +65,22 @@
$(SRCDIR)/os/win32
COMMON_OBJS=\
- $(SRCDIR)/main.$(OBJ) \
- $(SRCDIR)/buildmark.$(OBJ) \
- $(SRCDIR)/shared/error.$(OBJ) \
- $(SRCDIR)/shared/utils.$(OBJ) \
+ $(SRCDIR)/shared/error.$(OBJ)
LINUX_OBJS= \
- $(SRCDIR)/os/linux/os.$(OBJ) \
- $(SRCDIR)/os/linux/cpu.$(OBJ)
+ $(SRCDIR)/os/linux/os.$(OBJ)
SOLARIS_OBJS= \
- $(SRCDIR)/os/solaris/os.$(OBJ) \
- $(SRCDIR)/os/solaris/cpu.$(OBJ)
+ $(SRCDIR)/os/solaris/os.$(OBJ)
all: setup $(SHAREDLIB)
.c.$(OBJ):
- $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c -o $@ $<
.cpp.$(OBJ):
- $(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) -c -o $@ $<
+ $(CXX) $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -c -o $@ $<
$(SHAREDLIB): $(COMMON_OBJS) $(@platf...@_objs)
$(CC) $(SHFLAGS) $(LDFLAGS) -o $(BLDDIR)/$@ $(COMMON_OBJS)
$(@platf...@_objs)
Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=762819&r1=762818&r2=762819&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Tue Apr 7 15:28:16
2009
@@ -403,8 +403,9 @@
# Generate configuration header file
#
cat > $topdir/include/ccconfig.h << EOF
-# AUTOMATICALY GENERATED -- DO NOT EDIT
-#
+/*
+ * AUTOMATICALY GENERATED -- DO NOT EDIT
+ */
#ifndef _CCCONFIG_H
#define _CCCONFIG_H
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr.h?rev=762819&r1=762818&r2=762819&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr.h Tue Apr 7
15:28:16 2009
@@ -44,6 +44,12 @@
#include <stdio.h>
#include <stddef.h>
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
+#endif
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -59,15 +65,9 @@
#if HAVE_DLFCN_H
#include <dlfcn.h>
#endif
-#define HAVE_LINK_H
+#if HAVE_LINK_H
#include <link.h>
#endif
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
#if HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#endif
@@ -246,4 +246,4 @@
#ifdef __cplusplus
}
#endif
-#endif /* _ACR_H *
+#endif /* _ACR_H */
Modified: commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c?rev=762819&r1=762818&r2=762819&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c Tue Apr 7
15:28:16 2009
@@ -23,7 +23,7 @@
UNREFERENCED_STDARGS;
if ((type & ACR_OS_UNIX) == ACR_OS_UNIX)
return JNI_TRUE;
- else if (type == SIGHT_OS_LINUX)
+ else if (type == ACR_OS_LINUX)
return JNI_TRUE;
else
return JNI_FALSE;
@@ -71,7 +71,7 @@
return NULL;
}
-ACR_JNI_EXPORT_DECLAREjstring, OS, getNodename)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jstring, OS, getNodename)(ACR_JNISTDARGS)
{
struct utsname sys;
if (!uname(&sys))
