Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
2c6635f689
|
@ -18,7 +18,6 @@ int main(int argc, char** argv) {
|
||||||
std::atexit(deleteSharedMemory);
|
std::atexit(deleteSharedMemory);
|
||||||
std::string eingabe;
|
std::string eingabe;
|
||||||
|
|
||||||
|
|
||||||
while(eingabe != "exit") {
|
while(eingabe != "exit") {
|
||||||
std::cout << "cmd# ";
|
std::cout << "cmd# ";
|
||||||
std::cin >> eingabe;
|
std::cin >> eingabe;
|
||||||
|
|
|
@ -6,9 +6,8 @@
|
||||||
|
|
||||||
//ID-Speicherbereich
|
//ID-Speicherbereich
|
||||||
//Größe des Speicherbereichs hier 8MB (8000)
|
//Größe des Speicherbereichs hier 8MB (8000)
|
||||||
#define shmMaxSize 8000
|
|
||||||
//Shared-Memory-Segment erstellen oder öffnen – shmget()
|
//Shared-Memory-Segment erstellen oder öffnen – shmget()
|
||||||
#define Max_Memory_Size 8000
|
#define Max_Memory_Size 8000 * 1024
|
||||||
void deleteSharedMemory(int s);
|
void deleteSharedMemory(int s);
|
||||||
void deleteSharedMemory(void);
|
void deleteSharedMemory(void);
|
||||||
void initSharedMemory(void);
|
void initSharedMemory(void);
|
||||||
|
|
Loading…
Reference in New Issue