diff options
| -rw-r--r-- | README.win32 | 14 | ||||
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 4 | ||||
| -rwxr-xr-x | erts/etc/win32/cygwin_tools/vc/mc.sh | 8 | ||||
| -rwxr-xr-x | erts/etc/win32/cygwin_tools/vc/rc.sh | 4 | ||||
| -rw-r--r-- | lib/.gitignore | 7 | ||||
| -rw-r--r-- | lib/erl_interface/src/misc/ei_internal.h | 2 | ||||
| -rw-r--r-- | system/doc/reference_manual/modules.xml | 15 |
7 files changed, 45 insertions, 9 deletions
diff --git a/README.win32 b/README.win32 index a6d2609aae..6fd14b23dc 100644 --- a/README.win32 +++ b/README.win32 @@ -366,6 +366,20 @@ backslashes in your path environment variable in Cygwin bash, but LIB and INCLUDE should contain Windows style paths with semicolon, drive letters and backslashes. +If you wish to use Visual Studio 2008, a couple things need to be tweaked, +namely the fact that some of the SDK stuff is installed in (by default) +C:\Program Files\Microsoft SDKs\v6.0A . Just ensure that that +C:\Program Files\Microsoft SDKs\v6.0A\Lib is in LIB and +C:\Program Files\Microsoft SDKs\v6.0A\Include is in INCLUDE. A symptom of not +doing this is errors about finding kernel32.lib and windows.h. + +Additionally, if you encounter errors about mc.exe not being found, you must +install the entire Windows SDK (the partial SDK included in visual studio +apparently does not include it). After installing it you'll want to add +something like: /c/cygdrive/Program\ Files/Microsoft\ SDKs/v7.0/bin to your +PATH to allow the environment to find mc.exe. The next Visual Studio (2010) is +expected to include this tool. + * Sun's Java JDK 1.5.0 or higher. Our Java code (jinterface, ic) is written for JDK 1.5.0. Get it for Windows and install it, the JRE is not enough. If you don't care about Java, you can skip this step, the diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index b7b577da5b..c6e23ee647 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -1205,8 +1205,8 @@ static void *realloc_wrapper(void *current, size_t size){ /* For AssocID, 4 bytes should be enough -- checked by "init": */ # define GET_ASSOC_ID get_int32 # define ASSOC_ID_LEN 4 -# define LOAD_ASSOC_ID LOAD_INT -# define LOAD_ASSOC_ID_CNT LOAD_INT_CNT +# define LOAD_ASSOC_ID LOAD_UINT +# define LOAD_ASSOC_ID_CNT LOAD_UINT_CNT # define SCTP_ANC_BUFF_SIZE INET_DEF_BUFFER/2 /* XXX: not very good... */ #endif diff --git a/erts/etc/win32/cygwin_tools/vc/mc.sh b/erts/etc/win32/cygwin_tools/vc/mc.sh index 813b59947b..676b072655 100755 --- a/erts/etc/win32/cygwin_tools/vc/mc.sh +++ b/erts/etc/win32/cygwin_tools/vc/mc.sh @@ -24,7 +24,7 @@ CMD="" OUTPUT_DIRNAME="" # Find the correct mc.exe. This could be done by the configure script, -# But as we seldom use the resource compiler, it might as well be done here... +# But as we seldom use the message compiler, it might as well be done here... MCC="" save_ifs=$IFS IFS=: @@ -32,7 +32,7 @@ for p in $PATH; do if [ -f $p/mc.exe ]; then if [ -n "`$p/mc.exe -? 2>&1 >/dev/null </dev/null \ | grep -i \"message compiler\"`" ]; then - MCC=$p/mc.exe + MCC=`echo "$p/mc.exe" | sed 's/ /\\\\ /g'` fi fi done @@ -68,8 +68,8 @@ while test -n "$1" ; do done p=$$ if [ "X$MC_SH_DEBUG_LOG" != "X" ]; then - echo rc.sh "$SAVE" >>$MC_SH_DEBUG_LOG - echo rc.exe $CMD >>$MC_SH_DEBUG_LOG + echo mc.sh "$SAVE" >>$MC_SH_DEBUG_LOG + echo mc.exe $CMD >>$MC_SH_DEBUG_LOG fi if [ -n "$OUTPUT_DIRNAME" ]; then cd $OUTPUT_DIRNAME diff --git a/erts/etc/win32/cygwin_tools/vc/rc.sh b/erts/etc/win32/cygwin_tools/vc/rc.sh index 748de48890..6a6921c49e 100755 --- a/erts/etc/win32/cygwin_tools/vc/rc.sh +++ b/erts/etc/win32/cygwin_tools/vc/rc.sh @@ -30,8 +30,8 @@ save_ifs=$IFS IFS=: for p in $PATH; do if [ -f $p/rc.exe ]; then - if [ -n "`$p/rc.exe -? 2>&1 | grep -i "resource compiler"`" ]; then - RCC=$p/rc.exe + if [ -n "`$p/rc.exe -? 2>&1 | grep -i "resource compiler"`" ]; then + RCC=`echo "$p/rc.exe" | sed 's/ /\\\\ /g'` fi fi done diff --git a/lib/.gitignore b/lib/.gitignore index bdc850f3b7..0cb938ea7c 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -1,3 +1,10 @@ +# erl_interface + +/erl_interface/bin +/erl_interface/obj.mt +/erl_interface/obj.st +/erl_interface/obj + # megaco /megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3a.erl diff --git a/lib/erl_interface/src/misc/ei_internal.h b/lib/erl_interface/src/misc/ei_internal.h index 9f51d1f61b..f7805efebf 100644 --- a/lib/erl_interface/src/misc/ei_internal.h +++ b/lib/erl_interface/src/misc/ei_internal.h @@ -149,7 +149,7 @@ {if (ei_tracelevel >= 5) ei_trace_printf(NAME,1,FORMAT,ARG1,ARG2,ARG3,ARG4, \ ARG5,ARG6,ARG7);} -int ei_tracelevel; +extern int ei_tracelevel; void ei_trace_printf(const char *name, int level, const char *format, ...); diff --git a/system/doc/reference_manual/modules.xml b/system/doc/reference_manual/modules.xml index 8b14ca3459..f4885be480 100644 --- a/system/doc/reference_manual/modules.xml +++ b/system/doc/reference_manual/modules.xml @@ -167,6 +167,21 @@ fact(0) -> % | the original user-written file from which the source program was produced.</p> </section> + + <section> + <title>Types and function specifications</title> + <p>The current release implements types and function specifications + as described in + <url href="http://www.erlang.org/eeps/eep-0008.html">EEP8 - +Types and function specifications</url>. + + <note> + <p>The implementation and EEP8 may not exactly correspond to + each other. In a future release, type and function specifications + will be described in this reference manual.</p> + </note> + </p> + </section> </section> <section> |