Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/embryo
Dir : e17/libs/embryo/src/bin
Modified Files:
embryo_cc_amx.h embryo_cc_sc.h embryo_cc_sc2.c embryo_cc_sc6.c
Log Message:
ok that's it. fuck stdtypes.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/embryo/src/bin/embryo_cc_amx.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- embryo_cc_amx.h 25 Aug 2004 18:51:42 -0000 1.8
+++ embryo_cc_amx.h 9 Sep 2004 00:48:12 -0000 1.9
@@ -18,7 +18,7 @@
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
*
- * Version: $Id: embryo_cc_amx.h,v 1.8 2004/08/25 18:51:42 technikolor Exp $
+ * Version: $Id: embryo_cc_amx.h,v 1.9 2004/09/09 00:48:12 raster Exp $
*/
#include "embryo_cc_osdefs.h"
@@ -27,18 +27,7 @@
#ifndef EMBRYO_CC_AMX_H
#define EMBRYO_CC_AMX_H
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
- /* The ISO C99 defines the int16_t and int_32t types. If the compiler got
- * here, these types are probably undefined.
- */
-# ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-# else
-# ifndef HAVE_STDINT_H
#include <sys/types.h>
-# endif
-# endif
-#endif
/* calling convention for all interface functions and callback functions */
@@ -58,8 +47,8 @@
#if !defined CELL_TYPE
#define CELL_TYPE
- typedef uint32_t ucell;
- typedef int32_t cell;
+ typedef unsigned int ucell;
+ typedef int cell;
#endif
struct tagAMX;
@@ -81,7 +70,7 @@
typedef struct tagAMX_FUNCSTUB
{
- uint32_t address ;
+ unsigned int address;
char name[sEXPMAX + 1];
} AMX_FUNCSTUB __attribute__((packed));
@@ -127,23 +116,23 @@
*/
typedef struct tagAMX_HEADER
{
- int32_t size ; /* size of the "file" */
- uint16_t magic ; /* signature */
+ int size ; /* size of the "file" */
+ unsigned short magic ; /* signature */
char file_version ; /* file format version */
char amx_version ; /* required version of the AMX */
- int16_t flags ;
- int16_t defsize ; /* size of a definition record */
- int32_t cod ; /* initial value of COD - code block */
- int32_t dat ; /* initial value of DAT - data block */
- int32_t hea ; /* initial value of HEA - start of the heap */
- int32_t stp ; /* initial value of STP - stack top */
- int32_t cip ; /* initial value of CIP - the instruction pointer */
- int32_t publics ; /* offset to the "public functions" table */
- int32_t natives ; /* offset to the "native functions" table */
- int32_t libraries ; /* offset to the table of libraries */
- int32_t pubvars ; /* the "public variables" table */
- int32_t tags ; /* the "public tagnames" table */
- int32_t nametable ; /* name table, file version 7 only */
+ unsigned short flags ;
+ unsigned short defsize ; /* size of a definition record */
+ int cod ; /* initial value of COD - code block */
+ int dat ; /* initial value of DAT - data block */
+ int hea ; /* initial value of HEA - start of the heap */
+ int stp ; /* initial value of STP - stack top */
+ int cip ; /* initial value of CIP - the instruction pointer */
+ int publics ; /* offset to the "public functions" table */
+ int natives ; /* offset to the "native functions" table */
+ int libraries ; /* offset to the table of libraries */
+ int pubvars ; /* the "public variables" table */
+ int tags ; /* the "public tagnames" table */
+ int nametable ; /* name table, file version 7 only */
} AMX_HEADER __attribute__((packed));
#define AMX_MAGIC 0xf1e0
@@ -223,8 +212,8 @@
else (result) = NULL; \
}
- uint16_t *amx_Align16(uint16_t * v);
- uint32_t *amx_Align32(uint32_t * v);
+ unsigned short *amx_Align16(unsigned short * v);
+ unsigned int *amx_Align32(unsigned int * v);
int amx_Allot(AMX * amx, int cells, cell * amx_addr,
cell ** phys_addr);
int amx_Callback(AMX * amx, cell index, cell * result,
@@ -241,7 +230,7 @@
int amx_FindPubVar(AMX * amx, char *varname,
cell * amx_addr);
int amx_FindTagId(AMX * amx, cell tag_id, char *tagname);
- int amx_Flags(AMX * amx, uint16_t * flags);
+ int amx_Flags(AMX * amx, unsigned short * flags);
int amx_GetAddr(AMX * amx, cell amx_addr, cell ** phys_addr);
int amx_GetNative(AMX * amx, int index, char *funcname);
int amx_GetPublic(AMX * amx, int index, char *funcname);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/embryo/src/bin/embryo_cc_sc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- embryo_cc_sc.h 8 Aug 2004 16:18:18 -0000 1.4
+++ embryo_cc_sc.h 9 Sep 2004 00:48:12 -0000 1.5
@@ -9,7 +9,7 @@
* Copyright J.E. Hendrix, 1982, 1983
* Copyright T. Riemersma, 1997-2003
*
- * Version: $Id: embryo_cc_sc.h,v 1.4 2004/08/08 16:18:18 tsauerbeck Exp $
+ * Version: $Id: embryo_cc_sc.h,v 1.5 2004/09/09 00:48:12 raster Exp $
*
* This software is provided "as-is", without any express or implied warranty.
* In no event will the authors be held liable for any damages arising from
@@ -106,7 +106,7 @@
struct __s_symbol *next;
struct __s_symbol *parent; /* hierarchical types (multi-dimensional arrays) */
char name[sNAMEMAX + 1];
- uint32_t hash; /* value derived from name, for quicker searching */
+ unsigned int hash; /* value derived from name, for quicker searching */
cell addr; /* address or offset (or value for constant, index for
native function) */
char vclass; /* sLOCAL if "addr" refers to a local symbol */
char ident; /* see below for possible values */
@@ -472,7 +472,7 @@
int delete_functions);
int refer_symbol(symbol * entry, symbol * bywhom);
void markusage(symbol * sym, int usage);
-uint32_t namehash(char *name);
+unsigned int namehash(char *name);
symbol *findglb(char *name);
symbol *findloc(char *name);
symbol *findconst(char *name);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/embryo/src/bin/embryo_cc_sc2.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- embryo_cc_sc2.c 27 Jul 2004 00:58:25 -0000 1.11
+++ embryo_cc_sc2.c 9 Sep 2004 00:48:12 -0000 1.12
@@ -18,7 +18,7 @@
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
*
- * Version: $Id: embryo_cc_sc2.c,v 1.11 2004/07/27 00:58:25 raster Exp $
+ * Version: $Id: embryo_cc_sc2.c,v 1.12 2004/09/09 00:48:12 raster Exp $
*/
#include <assert.h>
#include <stdio.h>
@@ -2467,7 +2467,7 @@
* comparison (which is costly). There is little interest in avoiding
* clusters in similar names, which is why this function is plain simple.
*/
-SC_FUNC uint32_t
+SC_FUNC unsigned int
namehash(char *name)
{
unsigned char *ptr = (unsigned char *)name;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/embryo/src/bin/embryo_cc_sc6.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- embryo_cc_sc6.c 11 Jul 2004 09:50:42 -0000 1.5
+++ embryo_cc_sc6.c 9 Sep 2004 00:48:12 -0000 1.6
@@ -18,7 +18,7 @@
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
*
- * Version: $Id: embryo_cc_sc6.c,v 1.5 2004/07/11 09:50:42 tsauerbeck Exp $
+ * Version: $Id: embryo_cc_sc6.c,v 1.6 2004/09/09 00:48:12 raster Exp $
*/
#include <assert.h>
#include <stdio.h>
@@ -634,7 +634,7 @@
{
typedef struct tagFUNCSTUB
{
- uint32_t address, nameofs;
+ unsigned int address, nameofs;
} FUNCSTUB;
AMX_HEADER hdr;
FUNCSTUB func;
@@ -643,7 +643,7 @@
long nametablesize, nameofs;
char line[256], *instr, *params;
int i, pass;
- int16_t count;
+ short count;
symbol *sym, **nativelist;
constvalue *constptr;
cell mainaddr;
@@ -663,7 +663,7 @@
#endif
writeerror = FALSE;
- nametablesize = sizeof(int16_t);
+ nametablesize = sizeof(short);
numpublics = 0;
numnatives = 0;
numpubvars = 0;
@@ -798,7 +798,7 @@
/* dump zeros up to the rest of the header, so that we can easily "seek" */
for (nameofs = sizeof hdr; nameofs < cod; nameofs++)
putc(0, fout);
- nameofs = nametable + sizeof(int16_t);
+ nameofs = nametable + sizeof(short);
/* write the public functions table */
count = 0;
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
