[PD-dev] flext-64 patch

[cdr]

sorry, can't remember how many r's are in tom's email. i guess you could call this 'preliminary' as i havent tested a bunch of stuff, but "pool" works without crashing.. :)

-------------- next part --------------
? pd-linux/flatom.do
? pd-linux/flatom.ro
? pd-linux/flatom.sdo
? pd-linux/flatom.sro
? pd-linux/flatom.tdo
? pd-linux/flatom.tro
? pd-linux/flatom_app.do
? pd-linux/flatom_app.ro
? pd-linux/flatom_app.sdo
? pd-linux/flatom_app.sro
? pd-linux/flatom_app.tdo
? pd-linux/flatom_app.tro
? pd-linux/flatom_part.do
? pd-linux/flatom_part.ro
? pd-linux/flatom_part.sdo
? pd-linux/flatom_part.sro
? pd-linux/flatom_part.tdo
? pd-linux/flatom_part.tro
? pd-linux/flatom_pr.do
? pd-linux/flatom_pr.ro
? pd-linux/flatom_pr.sdo
? pd-linux/flatom_pr.sro
? pd-linux/flatom_pr.tdo
? pd-linux/flatom_pr.tro
? pd-linux/flattr.do
? pd-linux/flattr.ro
? pd-linux/flattr.sdo
? pd-linux/flattr.sro
? pd-linux/flattr.tdo
? pd-linux/flattr.tro
? pd-linux/flattr_ed.do
? pd-linux/flattr_ed.ro
? pd-linux/flattr_ed.sdo
? pd-linux/flattr_ed.sro
? pd-linux/flattr_ed.tdo
? pd-linux/flattr_ed.tro
? pd-linux/flbase.do
? pd-linux/flbase.ro
? pd-linux/flbase.sdo
? pd-linux/flbase.sro
? pd-linux/flbase.tdo
? pd-linux/flbase.tro
? pd-linux/flbind.do
? pd-linux/flbind.ro
? pd-linux/flbind.sdo
? pd-linux/flbind.sro
? pd-linux/flbind.tdo
? pd-linux/flbind.tro
? pd-linux/flbuf.do
? pd-linux/flbuf.ro
? pd-linux/flbuf.sdo
? pd-linux/flbuf.sro
? pd-linux/flbuf.tdo
? pd-linux/flbuf.tro
? pd-linux/fldsp.do
? pd-linux/fldsp.ro
? pd-linux/fldsp.sdo
? pd-linux/fldsp.sro
? pd-linux/fldsp.tdo
? pd-linux/fldsp.tro
? pd-linux/flext.do
? pd-linux/flext.ro
? pd-linux/flext.sdo
? pd-linux/flext.sro
? pd-linux/flext.tdo
? pd-linux/flext.tro
? pd-linux/flitem.do
? pd-linux/flitem.ro
? pd-linux/flitem.sdo
? pd-linux/flitem.sro
? pd-linux/flitem.tdo
? pd-linux/flitem.tro
? pd-linux/fllib.do
? pd-linux/fllib.ro
? pd-linux/fllib.sdo
? pd-linux/fllib.sro
? pd-linux/fllib.tdo
? pd-linux/fllib.tro
? pd-linux/flmeth.do
? pd-linux/flmeth.ro
? pd-linux/flmeth.sdo
? pd-linux/flmeth.sro
? pd-linux/flmeth.tdo
? pd-linux/flmeth.tro
? pd-linux/flmsg.do
? pd-linux/flmsg.ro
? pd-linux/flmsg.sdo
? pd-linux/flmsg.sro
? pd-linux/flmsg.tdo
? pd-linux/flmsg.tro
? pd-linux/flout.do
? pd-linux/flout.ro
? pd-linux/flout.sdo
? pd-linux/flout.sro
? pd-linux/flout.tdo
? pd-linux/flout.tro
? pd-linux/flproxy.do
? pd-linux/flproxy.ro
? pd-linux/flproxy.sdo
? pd-linux/flproxy.sro
? pd-linux/flproxy.tdo
? pd-linux/flproxy.tro
? pd-linux/flqueue.do
? pd-linux/flqueue.ro
? pd-linux/flqueue.sdo
? pd-linux/flqueue.sro
? pd-linux/flqueue.tdo
? pd-linux/flqueue.tro
? pd-linux/flsimd.do
? pd-linux/flsimd.ro
? pd-linux/flsimd.sdo
? pd-linux/flsimd.sro
? pd-linux/flsimd.tdo
? pd-linux/flsimd.tro
? pd-linux/flsupport.do
? pd-linux/flsupport.ro
? pd-linux/flsupport.sdo
? pd-linux/flsupport.sro
? pd-linux/flsupport.tdo
? pd-linux/flsupport.tro
? pd-linux/flthr.do
? pd-linux/flthr.ro
? pd-linux/flthr.sdo
? pd-linux/flthr.sro
? pd-linux/flthr.tdo
? pd-linux/flthr.tro
? pd-linux/fltimer.do
? pd-linux/fltimer.ro
? pd-linux/fltimer.sdo
? pd-linux/fltimer.sro
? pd-linux/fltimer.tdo
? pd-linux/fltimer.tro
? pd-linux/flutil.do
? pd-linux/flutil.ro
? pd-linux/flutil.sdo
? pd-linux/flutil.sro
? pd-linux/flutil.tdo
? pd-linux/flutil.tro
? pd-linux/flxlet.do
? pd-linux/flxlet.ro
? pd-linux/flxlet.sdo
? pd-linux/flxlet.sro
? pd-linux/flxlet.tdo
? pd-linux/flxlet.tro
Index: makefile.pd-linux
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/makefile.pd-linux,v
retrieving revision 1.19
diff -r1.19 makefile.pd-linux
22c22
< CFLAGS=-O2 
---
> CFLAGS=-O2 -fPIC
25c25
< CFLAGS_D=-g -DFLEXT_DEBUG      
---
> CFLAGS_D=-g -DFLEXT_DEBUG  -fPIC     
28c28
< CFLAGS_T=-DFLEXT_THREADS  
---
> CFLAGS_T=-DFLEXT_THREADS  -fPIC 
31c31
< CFLAGS_S=-DFLEXT_SHARED -DFLEXT_EXPORTS
---
> CFLAGS_S=-DFLEXT_SHARED -DFLEXT_EXPORTS  -fPIC
Index: source/flmap.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flmap.h,v
retrieving revision 1.3
diff -r1.3 flmap.h
26c26
<     public std::map<unsigned int,unsigned int>
---
>     public std::map<size_t,size_t>
28c28
<     typedef std::map<unsigned int,unsigned int> Parent;
---
>     typedef std::map<size_t,size_t> Parent;
32,33c32,33
<     iterator find(unsigned int k);
<     unsigned int &operator [](unsigned int k);
---
>     iterator find(size_t k);
>     size_t &operator [](size_t k);
35c35
<     typedef std::pair<unsigned int,unsigned int> pair;
---
>     typedef std::pair<size_t,size_t> pair;
69,71c69,71
<     inline iterator find(K k) { return AnyMap::find(*(unsigned int *)&k); }
<     inline T &operator [](K k) { return *(T *)&(AnyMap::operator [](*(unsigned int *)&k)); }
<     inline void erase(K k) { AnyMap::erase(*(unsigned int *)&k); }
---
>     inline iterator find(K k) { return AnyMap::find(*(size_t *)&k); }
>     inline T &operator [](K k) { return *(T *)&(AnyMap::operator [](*(size_t *)&k)); }
>     inline void erase(K k) { AnyMap::erase(*(size_t *)&k); }
Index: source/flsupport.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.cpp,v
retrieving revision 1.39
diff -r1.39 flsupport.cpp
290,291c290,291
< AnyMap::iterator AnyMap::find(unsigned int k) { return Parent::find(k); }
< unsigned int &AnyMap::operator [](unsigned int k) { return Parent::operator [](k); }
---
> AnyMap::iterator AnyMap::find(size_t k) { return Parent::find(k); }
> size_t &AnyMap::operator [](size_t k) { return Parent::operator [](k); }