# # # patch "Makefile" # from [87427535ef0907137382b73f16abdb166ef65cc7] # to [7ba91e52dc268dd7d434781d8a20e42cd10ec368] # # patch "crypto/ocaml-openssl.c" # from [ae8e0d986073fd8562d321f2f4e8d80fcafff6ed] # to [88ee1f154817722c2325617e7c9d0263b77edbfb] # ============================================================ --- Makefile 87427535ef0907137382b73f16abdb166ef65cc7 +++ Makefile 7ba91e52dc268dd7d434781d8a20e42cd10ec368 @@ -72,14 +72,14 @@ monotone-viz : $(OBJX) lib3rdparty.a ifeq ($(OCAMLBEST), opt) monotone-viz : $(OBJX) lib3rdparty.a - $(OCAMLOPT) -o $@ -I . $(MLINCDIRS) $(MLLIBS) $^ $(CRYPTO_LIB) $(SQLITE_LINK) + $(OCAMLOPT) -o $@ -I $(LABLGTK_DIR) $(MLLIBS) $^ $(CRYPTO_LIB) $(SQLITE_LINK) monotone-viz : MLLIBS = str.cmxa lablgtk.cmxa gtkInit.cmx lablgnomecanvas.cmxa ifeq ($(LOCAL_LABLGTK), yes) $(OBJX) : .lablgtk endif else monotone-viz : $(OBJ) lib3rdparty.a - $(OCAMLC) -custom -o $@ -I . $(MLINCDIRS) $(MLLIBS) $^ $(CRYPTO_LIB) $(SQLITE_LINK) + $(OCAMLC) -custom -o $@ -I $(LABLGTK_DIR) $(MLLIBS) $^ $(CRYPTO_LIB) $(SQLITE_LINK) monotone-viz : MLLIBS = str.cma lablgtk.cma gtkInit.cmo lablgnomecanvas.cma ifeq ($(LOCAL_LABLGTK), yes) $(OBJ) : .lablgtk ============================================================ --- crypto/ocaml-openssl.c ae8e0d986073fd8562d321f2f4e8d80fcafff6ed +++ crypto/ocaml-openssl.c 88ee1f154817722c2325617e7c9d0263b77edbfb @@ -99,7 +99,7 @@ ml_d2i_RSA_PUBKEY (value s) CAMLprim value ml_d2i_RSA_PUBKEY (value s) { - unsigned char *p; + const unsigned char *p; RSA *r_key; p = UString_val (s); @@ -113,7 +113,7 @@ ml_d2i_PKCS8_RSA_PrivateKey (value s) CAMLprim value ml_d2i_PKCS8_RSA_PrivateKey (value s) { - unsigned char *p; + const unsigned char *p; PKCS8_PRIV_KEY_INFO *p_key; EVP_PKEY *e_key; RSA *r_key;