← Back to branch summary

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

« back to all changes in this revision

Viewing changes to erts/emulator/sys/win32/erl_win_dyn_driver.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/emulator/sys/win32/erl_win_dyn_driver.h
1
1
/*
2
2
 * %CopyrightBegin%
3
3
 * 
4
 
 * Copyright Ericsson AB 2003-2009. All Rights Reserved.
 
4
 * Copyright Ericsson AB 2003-2011. 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
87
87
                                           unsigned long,
88
88
                                           unsigned long,
89
89
                                           unsigned long));
90
 
WDD_TYPEDEF(long, driver_binary_get_refc, (ErlDrvBinary *dbp));
91
 
WDD_TYPEDEF(long, driver_binary_inc_refc, (ErlDrvBinary *dbp));
92
 
WDD_TYPEDEF(long, driver_binary_dec_refc, (ErlDrvBinary *dbp));
 
90
WDD_TYPEDEF(ErlDrvSInt, driver_binary_get_refc, (ErlDrvBinary *dbp));
 
91
WDD_TYPEDEF(ErlDrvSInt, driver_binary_inc_refc, (ErlDrvBinary *dbp));
 
92
WDD_TYPEDEF(ErlDrvSInt, driver_binary_dec_refc, (ErlDrvBinary *dbp));
93
93
WDD_TYPEDEF(ErlDrvPDL, driver_pdl_create, (ErlDrvPort));
94
94
WDD_TYPEDEF(void, driver_pdl_lock, (ErlDrvPDL));
95
95
WDD_TYPEDEF(void, driver_pdl_unlock, (ErlDrvPDL));
96
 
WDD_TYPEDEF(long, driver_pdl_get_refc, (ErlDrvPDL));
97
 
WDD_TYPEDEF(long, driver_pdl_inc_refc, (ErlDrvPDL));
98
 
WDD_TYPEDEF(long, driver_pdl_dec_refc, (ErlDrvPDL));
 
96
WDD_TYPEDEF(ErlDrvSInt, driver_pdl_get_refc, (ErlDrvPDL));
 
97
WDD_TYPEDEF(ErlDrvSInt, driver_pdl_inc_refc, (ErlDrvPDL));
 
98
WDD_TYPEDEF(ErlDrvSInt, driver_pdl_dec_refc, (ErlDrvPDL));
99
99
WDD_TYPEDEF(void, driver_system_info, (ErlDrvSysInfo *, size_t));
100
100
WDD_TYPEDEF(int, driver_get_now, (ErlDrvNowData *));
101
101
WDD_TYPEDEF(int, driver_monitor_process, (ErlDrvPort port,