← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to erts/include/internal/erl_misc_utils.h

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
erts/include/internal/erl_misc_utils.h
1
1
/*
2
2
 * %CopyrightBegin%
3
3
 * 
4
 
 * Copyright Ericsson AB 2006-2009. All Rights Reserved.
 
4
 * Copyright Ericsson AB 2006-2010. All Rights Reserved.
5
5
 * 
6
6
 * The contents of this file are subject to the Erlang Public License,
7
7
 * Version 1.1, (the "License"); you may not use this file except in
34
34
 
35
35
erts_cpu_info_t *erts_cpu_info_create(void);
36
36
void erts_cpu_info_destroy(erts_cpu_info_t *cpuinfo);
37
 
void erts_cpu_info_update(erts_cpu_info_t *cpuinfo);
 
37
int erts_cpu_info_update(erts_cpu_info_t *cpuinfo);
38
38
int erts_get_cpu_configured(erts_cpu_info_t *cpuinfo);
39
39
int erts_get_cpu_online(erts_cpu_info_t *cpuinfo);
40
40
int erts_get_cpu_available(erts_cpu_info_t *cpuinfo);
50
50
 
51
51
int erts_milli_sleep(long);
52
52
 
 
53
#ifdef __WIN32__
 
54
int erts_map_win_error_to_errno(DWORD win_error);
 
55
int erts_get_last_win_errno(void);
 
56
#endif
 
57
 
53
58
#endif /* #ifndef ERL_MISC_UTILS_H_ */