Author: mturk
Date: Tue Feb 2 11:38:51 2010
New Revision: 905586
URL: http://svn.apache.org/viewvc?rev=905586&view=rev
Log:
Add suexec icon
Added:
commons/sandbox/runtime/trunk/src/main/native/support/win32/suexec.ico
(with props)
Modified:
commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
commons/sandbox/runtime/trunk/src/main/native/include/acr.h
commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc
Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=905586&r1=905585&r2=905586&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Tue Feb 2
11:38:51 2010
@@ -292,7 +292,7 @@
mt -nologo -manifest [email protected] -outputresource:$@;2
$(SUEXECBIN): $(SRCDIR)/support/win32/suexec.$(OBJ)
- $(RC) /l 0x409 /d "NDEBUG" /d STR_PRODUCT="\"Apache Commons Runtime
suEXEC\"" /d STR_INTNAME="\"suEXEC\"" /i "$(SRCDIR)\support\win32" /i
"$(SRCDIR)\os\win32" /i "$(SRCDIR)\include" /fo [email protected]
$(SRCDIR)/support/win32/support.rc
+ $(RC) /l 0x409 /d "NDEBUG" /d STR_PRODUCT="\"Apache Commons Runtime
suEXEC\"" /d STR_INTNAME="\"suEXEC\"" /d STR_ICONAME="\"suexec.ico\"" /i
"$(SRCDIR)\support\win32" /i "$(SRCDIR)\os\win32" /i "$(SRCDIR)\include" /fo
[email protected] $(SRCDIR)/support/win32/support.rc
$(LINK) $(SHFLAGS) /SUBSYSTEM:WINDOWS $(LDFLAGS) /pdb:suexec.pdb
/out:$@ @<<
$(SRCDIR)/support/win32/suexec.$(OBJ) [email protected]
<<
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=905586&r1=905585&r2=905586&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr.h Tue Feb 2
11:38:51 2010
@@ -232,21 +232,25 @@
#if HAVE_INT16_T
typedef int16_t acr_int16_t;
#else
+typedef short int16_t;
typedef short acr_int16_t;
#endif
#if HAVE_UINT16_T
typedef uint16_t acr_uint16_t;
#else
+typedef unsigned short uint16_t;
typedef unsigned short acr_uint16_t;
#endif
#if HAVE_INT32_T
typedef int32_t acr_int32_t;
#else
+typedef int int32_t;
typedef int acr_int32_t;
#endif
#if HAVE_UINT32_T
typedef uint32_t acr_uint32_t;
#else
+typedef unsigned int uint32_t;
typedef unsigned int acr_uint32_t;
#endif
typedef unsigned long acr_ino_t;
@@ -281,8 +285,10 @@
typedef intptr_t acr_intptr_t;
#else
#ifdef _WIN64
+typedef __int64 intptr_t;
typedef __int64 acr_intptr_t;
#else
+typedef int intptr_t;
typedef int acr_intptr_t;
#endif
#endif
@@ -290,8 +296,10 @@
typedef uintptr_t acr_uintptr_t;
#else
#ifdef _WIN64
+typedef unsigned __int64 uintptr_t;
typedef unsigned __int64 acr_uintptr_t;
#else
+typedef unsigned uintptr_t;
typedef unsigned acr_uintptr_t;
#endif
#endif
Added: commons/sandbox/runtime/trunk/src/main/native/support/win32/suexec.ico
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/support/win32/suexec.ico?rev=905586&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
commons/sandbox/runtime/trunk/src/main/native/support/win32/suexec.ico
------------------------------------------------------------------------------
svn:mime-type = image/x-icon
Modified: commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc?rev=905586&r1=905585&r2=905586&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc Tue
Feb 2 11:38:51 2010
@@ -80,7 +80,11 @@
#define IDS_APPFULLNAME 152
#define IDS_APPCOPYRIGHT 153
-IDI_MAINICON ICON "apache.ico"
+#ifndef STR_ICONAME
+#define STR_ICONAME "apache.ico"
+#endif
+IDI_MAINICON ICON STR_ICONAME
+
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "commonc.manifest"
STRINGTABLE
