Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit d42b5b12 authored by erwan's avatar erwan
Browse files

Define IID_IUnknown is lutinUtils rather than in polka

parent 7a93e1b5
Pipeline #1642 failed with stages
in 6 minutes and 20 seconds
......@@ -27,7 +27,8 @@ update_version:
make clean && make
cia:
cia: test cia-no-test
cia-no-test:
test -f committed && \
echo "*** I won't commit!\n*** until you 'make update_version'!" \
|| (git commit -a -F log && touch committed)
......
OASISFormat: 0.4
Name: Lutin
Version: 2.37
Version: 2.38
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: PROP
......@@ -54,7 +54,7 @@ Library "lutin-utils"
Path: lutin-utils/src
Modules: LutinUtils
Install: true
CSources: lutinUtils.h,lutinUtils_c.c,lutinUtils_stubs.c
CSources: lutinUtils.h,lutinUtils_c.c,lutinUtils_stubs.c,myuid.h,myuid.c
CCOpt: -fPIC -I$pkg_camlidl -I/usr/local/include/
Executable lurettetop_exe
......
# OASIS_START
# DO NOT EDIT (digest: 913199b6a516197e43dd95dd089af5f0)
# DO NOT EDIT (digest: 8f1d12a4517d69af223ed101aa5e4c82)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
......@@ -19,6 +19,7 @@ true: annot, bin_annot
<lutin-utils/src/*.ml{,i,y}>: oasis_library_lutin_utils_ccopt
"lutin-utils/src/lutinUtils_c.c": oasis_library_lutin_utils_ccopt
"lutin-utils/src/lutinUtils_stubs.c": oasis_library_lutin_utils_ccopt
"lutin-utils/src/myuid.c": oasis_library_lutin_utils_ccopt
<lutin-utils/src/lutin-utils.{cma,cmxa}>: use_liblutin-utils_stubs
# Library ezdl
"EZDL/ezdl.cmxs": use_ezdl
......
# OASIS_START
# DO NOT EDIT (digest: 54dc2eb65e95b431653a237e8006ffa2)
# DO NOT EDIT (digest: 7dc1b1107ab0fcd027142f21609bf8bb)
lutinUtils_c.o
lutinUtils_stubs.o
myuid.o
# OASIS_STOP
/* Time-stamp: <modified the 13/12/2017 (at 17:47) by Erwan Jahier> */
#include "myuid.h"
IID IID_IUnknown = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80 } };
IID IID_IX = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x81 } };
IID IID_IY = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x82 } };
/* Time-stamp: <modified the 13/12/2017 (at 17:48) by Erwan Jahier> */
// dllcamlidl.so requires that those are defined
// From what I understand, it's only used on windows (finger crossed)
typedef struct { unsigned char data[16]; } IID;
IID IID_IUnknown, IID_IX, IID_IY;
let str="2.37"
let sha="a5bb284"
let str="2.38"
let sha="7a93e1b"
......@@ -11,12 +11,6 @@
#include "matrix.h"
// necessary for using dllcamlidl.so
typedef struct { unsigned char data[16]; } IID;
IID IID_IUnknown = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80 } };
IID IID_IX = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x81 } };
IID IID_IY = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x82 } };
const int polka_integer = POLKA_NUM;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment